diff options
| author | Alexander Fougner <fougner89@gmail.com> | 2023-12-09 12:20:04 +0100 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-10 12:16:00 -0500 |
| commit | 4c5dcb018d9675260c056b6afa8508298d0dba75 (patch) | |
| tree | ae0b3844e7e047fd86719f0c3bae25855f8c1b7c | |
| parent | b44629a3dbe35f9ef84d3fa61b9d9f1a08b47075 (diff) | |
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>
| -rw-r--r-- | .github/workflows/build-packages.yml | 10 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | fsck/.gitignore | 1 | ||||
| -rw-r--r-- | packaging/bcachefs-tools.spec | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index e7dac5dd..ff8044ad 100644 --- 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 e68bd7ab..6f5bcb7b 100644 --- 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 7a713efb..f7278e80 100755 --- 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 0e3ad1b0..5be35c9e 100644 --- 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 7a9e7f16..944ffbd3 100644 --- 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 |