Followup-For: Bug #1060898
Control: tag -1 patch
Hi,
attached you can find an overhaul of the package installation that also
fixes the missing version.h
Having the Debian revision included in the dkms module version is very
unusual, now this only uses the upstream version.
The Vcs-* URLs in the package point to an empty repository ... otherwise
you could have gotten a MR with a sequence of commits.
Andreas
diff -Nru linux-apfs-rw-0.3.7/debian/README.Debian
linux-apfs-rw-0.3.7/debian/README.Debian
--- linux-apfs-rw-0.3.7/debian/README.Debian 2021-09-28 12:55:19.000000000
+0200
+++ linux-apfs-rw-0.3.7/debian/README.Debian 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-dkms build linux-apfs-rw/0+git20210928
diff -Nru linux-apfs-rw-0.3.7/debian/changelog
linux-apfs-rw-0.3.7/debian/changelog
--- linux-apfs-rw-0.3.7/debian/changelog 2024-01-21 17:29:59.000000000
+0100
+++ linux-apfs-rw-0.3.7/debian/changelog 2024-02-17 00:10:52.000000000
+0100
@@ -1,3 +1,10 @@
+linux-apfs-rw (0.3.7-2) UNRELEASED; urgency=medium
+
+ * Overhaul package installation.
+ * Use upstream dkms.conf and ship genver.sh. (Closes: #1060898)
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 17 Feb 2024 00:10:52 +0100
+
linux-apfs-rw (0.3.7-1) unstable; urgency=medium
* New upstream version. (Closes: #1060898)
diff -Nru linux-apfs-rw-0.3.7/debian/control linux-apfs-rw-0.3.7/debian/control
--- linux-apfs-rw-0.3.7/debian/control 2024-01-08 08:36:46.000000000 +0100
+++ linux-apfs-rw-0.3.7/debian/control 2024-02-17 00:10:52.000000000 +0100
@@ -13,7 +13,7 @@
Package: apfs-dkms
Architecture: all
Depends: ${misc:Depends}
-Description: APFS module for linux, with experimental write support
+Description: APFS module for Linux, with experimental write support
The Apple File System (APFS) is the copy-on-write filesystem currently used on
all Apple devices. This module provides a degree of experimental support on
Linux.
diff -Nru linux-apfs-rw-0.3.7/debian/dkms linux-apfs-rw-0.3.7/debian/dkms
--- linux-apfs-rw-0.3.7/debian/dkms 2022-01-10 15:25:20.000000000 +0100
+++ linux-apfs-rw-0.3.7/debian/dkms 2024-02-17 00:10:52.000000000 +0100
@@ -1,7 +1 @@
-PACKAGE_NAME="linux-apfs-rw"
-PACKAGE_VERSION="#MODULE_VERSION#"
-MAKE[0]="make -C ${kernel_source_dir}
M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
-CLEAN="make -C ${kernel_source_dir}
M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
-AUTOINSTALL=yes
-BUILT_MODULE_NAME[0]="apfs"
-DEST_MODULE_LOCATION[0]=/extra
+dkms.conf
diff -Nru linux-apfs-rw-0.3.7/debian/install linux-apfs-rw-0.3.7/debian/install
--- linux-apfs-rw-0.3.7/debian/install 1970-01-01 01:00:00.000000000 +0100
+++ linux-apfs-rw-0.3.7/debian/install 2024-02-17 00:10:52.000000000 +0100
@@ -0,0 +1,5 @@
+Makefile usr/src/linux-apfs-rw-${env:DEB_VERSION_UPSTREAM}/
+genver.sh usr/src/linux-apfs-rw-${env:DEB_VERSION_UPSTREAM}/
+*.c usr/src/linux-apfs-rw-${env:DEB_VERSION_UPSTREAM}/
+*.h usr/src/linux-apfs-rw-${env:DEB_VERSION_UPSTREAM}/
+lzfse usr/src/linux-apfs-rw-${env:DEB_VERSION_UPSTREAM}/
diff -Nru linux-apfs-rw-0.3.7/debian/rules linux-apfs-rw-0.3.7/debian/rules
--- linux-apfs-rw-0.3.7/debian/rules 2023-02-02 12:34:00.000000000 +0100
+++ linux-apfs-rw-0.3.7/debian/rules 2024-02-17 00:10:52.000000000 +0100
@@ -2,25 +2,13 @@
#export DH_VERBOSE = 1
include /usr/share/dpkg/pkg-info.mk
-
-pdkms:=apfs-dkms
-sname:=linux-apfs-rw
-#$(shell dpkg-parsechangelog --show-field=Version|rev|cut -d- -f2-|rev)
+export DEB_VERSION_UPSTREAM
%:
dh $@
override_dh_auto_clean:
- @echo CLEAN
override_dh_auto_build:
- @echo NO BUILD
override_dh_auto_install:
- @echo NO AUTO INSTALL
-
-override_dh_dkms:
- dh_install Makefile *.c *.h lzfse usr/src/$(sname)-$(DEB_VERSION)
- chmod 0644 debian/$(pdkms)/usr/src/$(sname)-$(DEB_VERSION)/*
- chmod 0755 debian/$(pdkms)/usr/src/$(sname)-$(DEB_VERSION)/lzfse
- dh_dkms -V $(DEB_VERSION)
