Create debian packages for grub-trenchboot_support

.gitlab-ci.yml

@@ -1,11 +1,15 @@
 stages:
+  - git-robot
   - build
 
 build_and_install:
   stage: build
   image: debian:stable-20200414
   tags:
     - local
+  timeout: 4h
+  except:
+    - debian-upstream
   before_script:
     - apt update && apt install -y build-essential bison flex python pkg-config autoconf automake git gettext autopoint libfuse-dev libdevmapper-dev libfreetype6-dev
   script:
@@ -19,6 +23,8 @@ build_and_install:
 
 build_nixpkg:
   stage: build
+  except:
+    - debian-upstream
   variables:
     NIXPKG: "grub"
     GRUB_COMMIT: "$CI_COMMIT_SHA"
@@ -27,3 +33,47 @@ build_nixpkg:
     project: trenchboot1/3mdeb/nixos-trenchboot-configs
     branch: master
     strategy: depend
+
+git_pull:
+  image: debian:stable-20200414
+  stage: git-robot
+  tags:
+    - local
+  only:
+    - trenchboot_support_2.04
+  before_script:
+    - echo "machine github.com
+              login 3mdeb-robot
+              password $GITHUB_PERSONAL_ACCESS_TOKEN" >> ~/.netrc
+    - apt update && apt install -y git
+    - git config --global user.email "[email protected]"
+    - git config --global user.name "3mdeb-robot"
+  script:
+    - git clone https://github.com/3mdeb/grub.git -b debian-upstream
+    - cd grub
+    - git pull . origin/trenchboot_support_2.04
+    - git push origin debian
+
+# For building debian package vfat and ext234 tests was
+# removed, because of error:
+# "losetup: cannot find an unused loop device"
+
+build_debian_pkg:
+  image: debian:bullseye-20200514
+  stage: build
+  tags:
+    - local
+  timeout: 4h
+  only:
+    - debian-upstream
+  before_script:
+    - ./.gitlab-ci/install-debian-build-deps.sh
+    - ln -s /usr/bin/python3 /usr/bin/python
+    - ./bootstrap
+  script:
+    - dpkg-buildpackage -b -rfakeroot --target-arch i386 -us -uc
+    - mkdir artifacts && mv ../*.deb artifacts/
+    - ./.gitlab-ci/show-package-content.sh
+  artifacts:
+    paths:
+      - artifacts/*

.gitlab-ci/install-debian-build-deps.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+echo "deb http://ftp.de.debian.org/debian stretch main" \
+>> /etc/apt/sources.list
+apt-get update
+apt-get -y install \
+  build-essential \
+  dh-make \
+  flex \
+  bison \
+  help2man \
+  texinfo \
+  xfonts-unifont \
+  libfreetype6-dev \
+  libdevmapper-dev \
+  libsdl1.2-dev \
+  xorriso \
+  qemu-system \
+  cpio \
+  parted \
+  libfuse-dev \
+  ttf-dejavu-core \
+  liblzma-dev \
+  dosfstools \
+  mtools \
+  wamerican \
+  pkg-config \
+  bash-completion \
+  libefiboot-dev \
+  libefivar-dev \
+  patchutils \
+  gcc-9-multilib \
+  git

.gitlab-ci/show-package-content.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DIR_FILES=$(ls artifacts)
+
+for elem in $DIR_FILES
+do
+    dpkg -c artifacts/$elem
+done

Makefile.util.def

@@ -730,12 +730,6 @@ script = {
   dependencies = 'garbage-gen$(BUILD_EXEEXT)';
 };
 
-script = {
-  testcase;
-  name = ext234_test;
-  common = tests/ext234_test.in;
-};
-
 script = {
   testcase;
   name = squashfs_test;
@@ -766,12 +760,6 @@ script = {
   common = tests/reiserfs_test.in;
 };
 
-script = {
-  testcase;
-  name = fat_test;
-  common = tests/fat_test.in;
-};
-
 script = {
   testcase;
   name = minixfs_test;

debian/.git-dpm

@@ -0,0 +1,9 @@
+# see git-dpm(1) from git-dpm package
+71e87f5ac2ffac3705655aecc22f3f872fb603d6
+71e87f5ac2ffac3705655aecc22f3f872fb603d6
+578bb115fbd47e1c464696f1f8d6183e5443975d
+578bb115fbd47e1c464696f1f8d6183e5443975d
+grub2_2.04.orig.tar.xz
+3ed21de7be5970d7638b9f526bca3292af78e0fc
+6393864
+signature:d6df202a9bfa89abe2d7f288c1d438197c6f371a:833:grub2_2.04.orig.tar.xz.asc

debian/.gitignore

@@ -0,0 +1,110 @@
+*.bash-completion
+*.config
+*.debhelper*
+*.postinst
+*.postrm
+*.preinst
+*.templates
+files
+grub-common
+grub-common.maintscript
+grub-coreboot
+grub-coreboot*.dirs
+grub-coreboot*.install
+grub-coreboot*.links
+grub-coreboot*.maintscript
+grub-coreboot-bin
+grub-coreboot-dbg
+grub-efi
+grub-efi-amd64
+grub-efi-amd64*.dirs
+grub-efi-amd64*.install
+grub-efi-amd64*.links
+grub-efi-amd64*.maintscript
+grub-efi-amd64-bin
+grub-efi-amd64-dbg
+grub-efi-amd64-signed-template
+grub-efi-arm
+grub-efi-arm*.dirs
+grub-efi-arm*.install
+grub-efi-arm*.links
+grub-efi-arm*.maintscript
+grub-efi-arm-bin
+grub-efi-arm-dbg
+grub-efi-arm64
+grub-efi-arm64*.dirs
+grub-efi-arm64*.install
+grub-efi-arm64*.links
+grub-efi-arm64*.maintscript
+grub-efi-arm64-bin
+grub-efi-arm64-dbg
+grub-efi-arm64-signed-template
+grub-efi-ia32
+grub-efi-ia32*.dirs
+grub-efi-ia32*.install
+grub-efi-ia32*.links
+grub-efi-ia32*.maintscript
+grub-efi-ia32-bin
+grub-efi-ia32-dbg
+grub-efi-ia32-signed-template
+grub-efi-ia64
+grub-efi-ia64*.dirs
+grub-efi-ia64*.install
+grub-efi-ia64*.links
+grub-efi-ia64*.maintscript
+grub-efi-ia64-bin
+grub-efi-ia64-dbg
+grub-emu
+grub-emu*.dirs
+grub-emu*.install
+grub-emu*.links
+grub-emu*.maintscript
+grub-emu-dbg
+grub-extras-enabled
+grub-extras/*/conf/*.mk
+grub-firmware-qemu
+grub-ieee1275
+grub-ieee1275*.dirs
+grub-ieee1275*.install
+grub-ieee1275*.links
+grub-ieee1275*.maintscript
+grub-ieee1275-bin
+grub-ieee1275-dbg
+grub-linuxbios
+grub-mount-udeb
+grub-pc
+grub-pc*.dirs
+grub-pc*.install
+grub-pc*.links
+grub-pc*.maintscript
+grub-pc-bin
+grub-pc-dbg
+grub-rescue-pc
+grub-theme-starfield
+grub-uboot
+grub-uboot*.dirs
+grub-uboot*.install
+grub-uboot*.links
+grub-uboot*.maintscript
+grub-uboot-bin
+grub-uboot-dbg
+grub-xen
+grub-xen*.dirs
+grub-xen*.install
+grub-xen*.links
+grub-xen*.maintscript
+grub-xen-bin
+grub-xen-dbg
+grub-xen-host
+grub-yeeloong
+grub-yeeloong*.dirs
+grub-yeeloong*.install
+grub-yeeloong*.links
+grub-yeeloong*.maintscript
+grub-yeeloong-bin
+grub-yeeloong-dbg
+grub2
+grub2-common
+prep-bootdev
+stamps
+tmp-*

debian/NEWS

@@ -0,0 +1,13 @@
+grub2 (1.96+20090609-1) experimental; urgency=low
+
+  Before this version, grub-efi was 32bit on i386 and 64bit on amd64.
+  However, EFI can be 32bit even if you have a 64bit CPU, like in the
+  first MacBook models with Core 2 Duo released in late 2006.  Thus,
+  grub-efi has been split into grub-efi-amd64 and grub-efi-ia32 which are
+  available on both amd64 and i386.
+
+  If you've experienced problems trying to load grub.efi, please try
+  again using the package that doesn't match your CPU's architecture.
+
+ -- Felix Zielcke <[email protected]>  Tue, 09 Jun 2009 19:21:15 +0200
+

debian/README.source

@@ -0,0 +1,41 @@
+Git Tree
+========
+
+The grub2 packaging is maintained via the grub-team project on Salsa:
+https://salsa.debian.org/grub-team
+
+The primary git tree is grub-team/grub.  It can be obtained with:
+
+     git clone https://salsa.debian.org/grub-team/grub
+
+Git Subtrees
+------------
+
+grub.git/debian/grub-extras is maintained using git subtree merges.  To
+update it to a given commit, first ensure that you have the relevant
+upstream remote, e.g.:
+
+    git remote add -f grub-extras https://git.sv.gnu.org/git/grub-extras.git
+
+And then:
+
+    git subtree merge -P debian/grub-extras <commit>
+
+Git Branches
+------------
+
+grub-team/grub uses git-dpm and contains the following branches:
+
+- upstream:
+
+  The master branch of the upstream grub.git tree, at the point
+  corresponding to the current Debian package version.
+
+- master:
+
+  The main packaging branch, based on upstream.  debian/patches
+  maintained using git-dpm.
+
+- pristine-tar:
+
+  pritine-tar metadata based on upstream (not upstream).