Fix missing packaging files from release tarballs

Properly distribute files for native Debian packages. This fixes the
issue with broken release tarballs.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
Closes#15404
Closes#15586
This commit is contained in:
Umer Saleem 2024-10-03 20:45:10 +05:00 committed by Brian Behlendorf
parent 42ce4b11e7
commit c204c3f340
8 changed files with 55 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -1 +0,0 @@
../etc/init.d/zfs-zed

View File

@ -1 +0,0 @@
../etc/init.d/zfs-import

View File

@ -1 +0,0 @@
../etc/init.d/zfs-load-key

View File

@ -1 +0,0 @@
../etc/init.d/zfs-mount

View File

@ -1 +0,0 @@
../etc/init.d/zfs-share

View File

@ -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)~),"