fix packaging

- make deb fails with dh: error: Unknown sequence --with
  (options should not come before the sequence)

- fix deb build deps

- add missing rpm files

Signed-off-by: Alexander Fougner <fougner89@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index e7dac5dd06efaceaf56e6d10cfcd7c4df84995da..ff8044ad21cf9f0fb9ec2f9472d7ed863fb18e83 100644 (file)
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -18,11 +18,11 @@ jobs:
         run: sudo rm -f /var/lib/man-db/auto-update
       - name: Install build-deps
         run: |
-          sudo apt-get update && sudo apt-get -y --no-install-recommends install pkg-config libaio-dev libblkid-dev \
-              libkeyutils-dev liblz4-dev libsodium-dev liburcu-dev libzstd-dev \
-              uuid-dev zlib1g-dev valgrind libudev-dev python3-docutils \
-              debhelper llvm clang libclang-dev rustc cargo \
-              devscripts udev
+          sudo apt-get update && sudo apt-get -y --no-install-recommends install \
+              valgrind \
+              equivs devscripts
+          mk-build-deps
+          sudo apt install ./bcachefs-tools-build-deps_*.deb
       - name: Setup Rust
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal

diff --git a/debian/control b/debian/control
index e68bd7ab24cf04551ad72ca8324281c2c6b85266..6f5bcb7b152310b3ba06d72f76594122b7e6b761 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Maintainer: Kent Overstreet <kent.overstreet@gmail.com>
 Section: utils
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), pkg-config, libaio-dev, libblkid-dev,
+Build-Depends: debhelper (>= 9), dh-python, pkg-config, libaio-dev, libblkid-dev,
        libkeyutils-dev, liblz4-dev, libsodium-dev, liburcu-dev, libudev-dev,
        libzstd-dev, uuid-dev, zlib1g-dev, python3, python3-docutils,
-       rustc, cargo, llvm, clang, libclang-dev, systemd
+       rustc, cargo, llvm, clang, libclang-dev, systemd, udev
 Homepage: https://bcachefs.org/
 
 Package: bcachefs-tools

diff --git a/debian/rules b/debian/rules
index 7a713efbe266fcd19c7ce8c1bdb9856c77fcddf7..f7278e8092287967192094c219ec42530cfa86f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 PREFIX := /usr
 
 %:
-       dh --with python3 $@
+       dh $@ --with python3
 
 override_dh_auto_install:
        dh_auto_install -- "PREFIX=$(PREFIX)"

diff --git a/fsck/.gitignore b/fsck/.gitignore
index 0e3ad1b06cc8068b7dff321d1450398b5c2c455e..5be35c9ee6b05ffee3af21f6820d5a88eac78327 100644 (file)
--- a/fsck/.gitignore
+++ b/fsck/.gitignore
@@ -1 +1,2 @@
 *.service
+bcachefsck_all
\ No newline at end of file

diff --git a/packaging/bcachefs-tools.spec b/packaging/bcachefs-tools.spec
index 7a9e7f1636eedeaeb4d9c759819159ec826beeb8..944ffbd30a3e3aa4bfa08e8eec6286bb1820be0c 100644 (file)
--- a/packaging/bcachefs-tools.spec
+++ b/packaging/bcachefs-tools.spec
@@ -20,6 +20,7 @@ BuildRequires:  libuuid-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  lz4-devel
 BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  udev
 BuildRequires:  userspace-rcu-devel
 BuildRequires:  zlib-devel
@@ -55,6 +56,9 @@ rm -f %{buildroot}/usr/lib/libbcachefs.so
 %{_sbindir}/mkfs.fuse.bcachefs
 %{_mandir}/man8/bcachefs.8.gz
 %{_udevrulesdir}/64-bcachefs.rules
+%{_unitdir}/bcachefsck*
+%{_unitdir}/system-bcachefsck.slice
+%{_prefix}/lib/bcachefsck*
 
 %changelog
 * Tue Nov 15 2022 Eric Sandeen <sandeen@sandeen.net> - 2022.11.15-1