Merge pull request #447 from LebedevRI/debian

A few more follow-up fix-ups for Deb PPA

.github/workflows/deb-publish.yml

@@ -69,6 +69,7 @@ jobs:
           podman run \
             --name container \
             --image-volume=tmpfs \
+            --device=/dev/fuse \
             --tmpfs=/run \
             --tmpfs=/tmp \
             --tmpfs=/var/tmp \

.github/workflows/deb-src.yml

@@ -108,10 +108,12 @@ jobs:
             curl \
             debian-keyring \
             devscripts \
+            gcc \
             git \
             git-buildpackage \
             gnupg \
             iproute2 \
+            libc6-dev \
             mmdebstrap \
             sbuild \
             tar \
@@ -210,6 +212,13 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
             sh -s -- --default-toolchain ${{ env.RUST_VERSION }} --profile minimal -y
           . "$HOME/.cargo/env"
+      - name: Install cargo-vendor-filterer
+        timeout-minutes: 1
+        shell: sudo podman exec --interactive --tty container eatmydata sh "{0}"
+        run: |
+          set -xe
+          . "$HOME/.cargo/env"
+          cargo install --locked cargo-vendor-filterer
       - name: Fetch our git repository
         timeout-minutes: 1
         uses: actions/checkout@v4

Cargo.toml

@@ -41,4 +41,4 @@ default-features = false
 strip = "none"
 
 [package.metadata.vendor-filter]
-platforms = ["*-unknown-linux-*"]
+platforms = ["*-linux-*"]

debian/gbp.conf

@@ -4,7 +4,7 @@ upstream-tag = v%(version)s
 ignore-branch = True
 cleaner =
 export-dir = ../bcachefs-tools-deb-export-dir
-postexport = cargo vendor
+postexport = cargo vendor-filterer
 compression = xz
 compression-level = 9
 

debian/rules

@@ -31,6 +31,21 @@ endif
 
 export CARGO_ARGS = "--frozen"
 
+# WARNING: split debug info makes the package unreproducible!
+#
+# export CFLAGS += -gsplit-dwarf
+# export RUSTFLAGS += -C split-debuginfo=packed
+#
+# override_dh_dwz:
+# 	# Skipping DWZ since debug info is split.
+
+# WARNING: compressed debug info without split debug info results in
+#          size increase(!), and breaks DWZ.
+#
+# export CFLAGS += -gz=zlib
+# export LDFLAGS += -Wl,--compress-debug-sections=zlib
+# export RUSTFLAGS += -C link-arg=-Wl,--compress-debug-sections=zlib
+
 %:
 	dh $@ --parallel --with dkms