Merge pull request #435 from LebedevRI/debian

Debian: ensure smooth upgrade paths when files are moved between packages

.github/workflows/deb-buildd.yml

@@ -36,7 +36,7 @@ jobs:
       attestations: write
     steps:
       - name: Install necessary packages
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           set -xe
           tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io > /dev/null <<EOT
@@ -68,8 +68,9 @@ jobs:
           deb http://deb.debian.org/debian unstable main
           EOT
           apt update
-          apt full-upgrade
+          apt install eatmydata
-          apt install \
+          eatmydata apt full-upgrade
+          eatmydata apt install \
             ${{ inputs.dist-name }}-keyring \
             autopkgtest \
             curl \
@@ -148,11 +149,20 @@ jobs:
           \$run_piuparts = 0;
           \$run_autopkgtest = 0;
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
+            '--include=eatmydata',
             '--variant=apt'
           ];
           EOT
           if [ "${{ inputs.dist-name }}" = "debian" ];
           then
+          tee -a ~/.sbuildrc > /dev/null <<EOT
+          push @{\$unshare_mmdebstrap_extra_args}, "*", [
+            '--hook-dir=/usr/share/mmdebstrap/hooks/eatmydata'
+          ];
+          EOT
+          fi
+          if [ "${{ inputs.dist-name }}" = "debian" ];
+          then
           MIRROR="http://deb.debian.org/debian"
           elif [ "${{ inputs.dist-name }}" = "ubuntu" ] && [ "${{ inputs.arch }}" = "amd64" ];
           then
@@ -244,7 +254,7 @@ jobs:
           then
           export DEB_BUILD_OPTIONS=noautodbgsym
           fi
-          sbuild --verbose --arch-any --arch-all "$GITHUB_WORKSPACE/deb-src/"*.dsc
+          eatmydata sbuild --verbose --arch-any --arch-all "$GITHUB_WORKSPACE/deb-src/"*.dsc
       - name: Ensure that all binary artifacts are signed, or sign them
         timeout-minutes: 1
         if: steps.gpg.conclusion != 'skipped'
@@ -294,10 +304,10 @@ jobs:
           set -xe
           IMAGE="/tmp/autopkgtest-qemu-image.qcow2"
           echo "IMAGE=$(echo ${IMAGE})" >> $GITHUB_ENV
-          mmdebstrap-autopkgtest-build-qemu --boot=efi --mirror "${{ env.MIRROR }}" "${{ inputs.dist-version }}" "$IMAGE"
+          eatmydata mmdebstrap-autopkgtest-build-qemu --boot=efi --mirror "${{ env.MIRROR }}" "${{ inputs.dist-version }}" "$IMAGE"
       - name: Run autopkgtest
         timeout-minutes: 10
         if: steps.qemu-image.conclusion != 'skipped'
         run: |
           set -xe
-          autopkgtest --no-built-binaries --apt-upgrade "$GITHUB_WORKSPACE/deb-src"/*.dsc "${{ env.BUILD_DIR }}"/*.changes -- autopkgtest-virt-qemu --qemu-options="-smp $(nproc --all)" --boot=efi "${{ env.IMAGE }}"
+          eatmydata autopkgtest --no-built-binaries --apt-upgrade "$GITHUB_WORKSPACE/deb-src"/*.dsc "${{ env.BUILD_DIR }}"/*.changes -- autopkgtest-virt-qemu --qemu-options="-smp $(nproc --all)" --boot=efi "${{ env.IMAGE }}"

.github/workflows/deb-publish.yml

@@ -23,7 +23,7 @@ jobs:
       SUITE: ${{ (github.event_name == 'push' && github.ref_type == 'tag') && 'release' || 'snapshot' }}
     steps:
       - name: Install necessary packages
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           set -xe
           tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io > /dev/null <<EOT

.github/workflows/deb-src.yml

@@ -31,7 +31,7 @@ jobs:
       DEBPKG_EPOCH: 1
     steps:
       - name: Install necessary packages
-        timeout-minutes: 1
+        timeout-minutes: 2
         run: |
           set -xe
           tee /etc/dpkg/dpkg.cfg.d/force-unsafe-io > /dev/null <<EOT
@@ -63,8 +63,9 @@ jobs:
           deb http://deb.debian.org/debian unstable main
           EOT
           apt update
-          apt full-upgrade
+          apt install eatmydata
-          apt install \
+          eatmydata apt full-upgrade
+          eatmydata apt install \
             ${{ inputs.dist-name }}-keyring \
             curl \
             devscripts \
@@ -130,6 +131,8 @@ jobs:
           EOT
           tee -a ~/.sbuildrc > /dev/null <<EOT
           push @{\$unshare_mmdebstrap_extra_args}, "*", [
+            '--include=eatmydata',
+            '--hook-dir=/usr/share/mmdebstrap/hooks/eatmydata',
             'http://deb.debian.org/debian',
             '--variant=apt',
             '--keyring=/usr/share/keyrings/debian-keyring.gpg',
@@ -140,7 +143,7 @@ jobs:
         timeout-minutes: 1
         run: |
           set -xe
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain $RUST_VERSION --profile minimal -y
+          eatmydata curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain $RUST_VERSION --profile minimal -y
           . "$HOME/.cargo/env"
       - name: Fetch our git repository
         timeout-minutes: 1
@@ -174,7 +177,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/bcachefs-tools"
           mkdir -p "$GITHUB_WORKSPACE/deb-src"
           # FIXME: pubkey is not avaliable in chroot, .dsc signature verification fails
-          gbp buildpackage --git-verbose --git-ignore-branch --no-clean --git-dist=${{ inputs.dist-version }} --git-builder=sbuild --source --source-only-changes --no-arch-all --no-arch-any
+          eatmydata gbp buildpackage --git-verbose --git-ignore-branch --no-clean --git-dist=${{ inputs.dist-version }} --git-builder=sbuild --source --source-only-changes --no-arch-all --no-arch-any
       - name: Ensure that all source artifacts are signed, or sign them
         timeout-minutes: 1
         if: steps.gpg.conclusion != 'skipped'

debian/control

@@ -39,6 +39,8 @@ Recommends: bcachefs-kernel-dkms (= ${binary:Version}),
             initramfs-tools | linux-initramfs-tool,
 Breaks: bcachefs-kernel-dkms (<< ${binary:Version}),
         bcachefs-kernel-dkms (>> ${binary:Version}),
+Replaces: bcachefs-kernel-dkms (<< ${binary:Version}),
+          bcachefs-kernel-dkms (>> ${binary:Version}),
 Description: bcachefs userspace tools
  Userspace tools for bcachefs, a modern copy on write, checksumming, multi
  device filesystem.