Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix packaging issues for native Debian packages #16604

Closed
wants to merge 3 commits into from
Closed

Fix packaging issues for native Debian packages #16604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6485d52
Fix missing packaging files from release tarballs
usaleem-ix Oct 3, 2024
a8b1a09
Disable parallel build for native-deb* targets
usaleem-ix Oct 3, 2024
f4dbb9d
Update path for zed in zfs-zed.service for native debian packages
usaleem-ix Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/deb.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,5 @@ native-deb-kmod: native-deb-local debian
fakeroot debian/rules override_dh_binary-modules;

native-deb: native-deb-utils native-deb-kmod

.NOTPARALLEL: native-deb native-deb-utils native-deb-kmod
1 change: 1 addition & 0 deletions contrib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include $(srcdir)/%D%/bash_completion.d/Makefile.am
include $(srcdir)/%D%/debian/Makefile.am
include $(srcdir)/%D%/pyzfs/Makefile.am
include $(srcdir)/%D%/zcp/Makefile.am

Expand Down
48 changes: 48 additions & 0 deletions contrib/debian/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
dist_noinst_DATA += %D%/changelog.in
dist_noinst_DATA += %D%/clean
dist_noinst_DATA += %D%/control
dist_noinst_DATA += %D%/control.modules.in
dist_noinst_DATA += %D%/copyright
dist_noinst_DATA += %D%/Makefile.am
dist_noinst_DATA += %D%/not-installed
dist_noinst_DATA += %D%/openzfs-libnvpair3.docs
dist_noinst_DATA += %D%/openzfs-libnvpair3.install.in
dist_noinst_DATA += %D%/openzfs-libpam-zfs.install
dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst
dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm
dist_noinst_DATA += %D%/openzfs-libuutil3.docs
dist_noinst_DATA += %D%/openzfs-libuutil3.install.in
dist_noinst_DATA += %D%/openzfs-libzfs4.docs
dist_noinst_DATA += %D%/openzfs-libzfs4.install.in
dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs
dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.install.in
dist_noinst_DATA += %D%/openzfs-libzfs-dev.docs
dist_noinst_DATA += %D%/openzfs-libzfs-dev.install.in
dist_noinst_DATA += %D%/openzfs-libzpool5.docs
dist_noinst_DATA += %D%/openzfs-libzpool5.install.in
dist_noinst_DATA += %D%/openzfs-python3-pyzfs.install
dist_noinst_DATA += %D%/openzfs-zfs-dkms.config
dist_noinst_DATA += %D%/openzfs-zfs-dkms.dkms
dist_noinst_DATA += %D%/openzfs-zfs-dkms.docs
dist_noinst_DATA += %D%/openzfs-zfs-dkms.install
dist_noinst_DATA += %D%/openzfs-zfs-dkms.postinst
dist_noinst_DATA += %D%/openzfs-zfs-dkms.prerm
dist_noinst_DATA += %D%/openzfs-zfs-dkms.templates
dist_noinst_DATA += %D%/openzfs-zfs-dkms.triggers
dist_noinst_DATA += %D%/openzfs-zfs-dracut.install
dist_noinst_DATA += %D%/openzfs-zfs-initramfs.install
dist_noinst_DATA += %D%/openzfs-zfs-modules-_KVERS_-di.install.in
dist_noinst_DATA += %D%/openzfs-zfs-modules-_KVERS_.install.in
dist_noinst_DATA += %D%/openzfs-zfs-modules-_KVERS_.postinst.in
dist_noinst_DATA += %D%/openzfs-zfs-modules-_KVERS_.postrm.in
dist_noinst_DATA += %D%/openzfs-zfs-test.install
dist_noinst_DATA += %D%/openzfs-zfsutils.docs
dist_noinst_DATA += %D%/openzfs-zfsutils.examples
dist_noinst_DATA += %D%/openzfs-zfsutils.install
dist_noinst_DATA += %D%/openzfs-zfsutils.postinst
dist_noinst_DATA += %D%/openzfs-zfs-zed.install
dist_noinst_DATA += %D%/openzfs-zfs-zed.postinst
dist_noinst_DATA += %D%/openzfs-zfs-zed.postrm
dist_noinst_DATA += %D%/rules.in
dist_noinst_DATA += %D%/source
dist_noinst_DATA += %D%/tree
1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfs-zed.zfs-zed.init
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfsutils.zfs-import.init
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfsutils.zfs-load-key.init
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfsutils.zfs-mount.init
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/openzfs-zfsutils.zfs-share.init
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions contrib/debian/rules.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ override_dh_auto_configure:
sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
done

ln -s '$(CURDIR)/etc/init.d/zfs-import' '$(CURDIR)/debian/openzfs-zfsutils.zfs-import.init'
ln -s '$(CURDIR)/etc/init.d/zfs-load-key' '$(CURDIR)/debian/openzfs-zfsutils.zfs-load-key.init'
ln -s '$(CURDIR)/etc/init.d/zfs-mount' '$(CURDIR)/debian/openzfs-zfsutils.zfs-mount.init'
ln -s '$(CURDIR)/etc/init.d/zfs-share' '$(CURDIR)/debian/openzfs-zfsutils.zfs-share.init'
ln -s '$(CURDIR)/etc/init.d/zfs-zed' '$(CURDIR)/debian/openzfs-zfs-zed.zfs-zed.init'

override_dh_gencontrol:
dh_gencontrol -- -Vlinux:Recommends="linux-libc-dev (<< $(LINUX_NEXT)~), linux-libc-dev (>= $(LINUX_MIN)~),"

Expand All @@ -82,6 +88,7 @@ override_dh_auto_install:

@# Zed has dependencies outside of the system root.
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
sed -i 's|ExecStart=/sbin/|ExecStart=/usr/sbin/|g' '$(CURDIR)/debian/tmp/lib/systemd/system/zfs-zed.service'

@# Install the DKMS source.
@# We only want the files needed to build the modules
Expand Down
Loading