Source: openafs
Version: 1.8.13.2-1
Severity: important
Tags: patch
Hi,
I have a few updates for the -source package that I'd like to see in
trixie. Especially I want all -source packages in trixie to have
autopkgtests that check buildability of modules with module-assistant.
Thanks for considering
Andreas
PS: the git repository is not up-to-date, otherwise you could have
gotten a merge request
>From f10966600cf2288df9e2f026db08704b63ebec9f Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Wed, 19 Feb 2025 22:31:37 +0100
Subject: [PATCH 1/3] Add autopkgtest for the -source package
---
debian/tests/control | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 debian/tests/control
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..697c7e03d
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,11 @@
+Test-Command: env BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT"
/usr/share/modass/module-assistant-autopkgtest openafs-modules-source
+Features: test-name=m-a-autopkgtest
+Depends:
+ openafs-modules-source,
+ module-assistant-autopkgtest,
+ linux-doc,
+Restrictions:
+ superficial,
+ needs-root,
+ breaks-testbed,
+ allow-stderr,
--
2.39.5
>From 39626839872c0e2f44ab7992afd4402b230806b4 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Sat, 22 Feb 2025 04:47:51 +0100
Subject: [PATCH 2/3] Skip building modules for kernels with
CONFIG_PREEMPT_RT_FULL
---
debian/openafs-modules-dkms.dkms | 2 +-
debian/tests/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/openafs-modules-dkms.dkms b/debian/openafs-modules-dkms.dkms
index 12f33f81d..39a136446 100644
--- a/debian/openafs-modules-dkms.dkms
+++ b/debian/openafs-modules-dkms.dkms
@@ -31,7 +31,7 @@ BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
DEST_MODULE_LOCATION[0]="/updates/dkms/"
AUTOINSTALL=yes
-BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT"
+BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT !CONFIG_PREEMPT_RT_FULL"
# Tell configure the sysname if we were able to determine it.
if [ "${AFS_SYSNAME}" = 'UNKNOWN' ] ; then
diff --git a/debian/tests/control b/debian/tests/control
index 697c7e03d..dff4f34c7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
-Test-Command: env BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT"
/usr/share/modass/module-assistant-autopkgtest openafs-modules-source
+Test-Command: env BUILD_EXCLUSIVE_CONFIG="!CONFIG_PREEMPT_RT
!CONFIG_PREEMPT_RT_FULL" /usr/share/modass/module-assistant-autopkgtest
openafs-modules-source
Features: test-name=m-a-autopkgtest
Depends:
openafs-modules-source,
--
2.39.5
>From 2c1d601639d81bcd574b6f6fb40b9a38f70c7493 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Sat, 8 Mar 2025 09:44:16 +0100
Subject: [PATCH 3/3] Modernize packing the module source tarball to not
require root
---
debian/control | 2 +-
debian/rules | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/debian/control b/debian/control
index 44f726cb6..fe8cf9ba9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper,
debhelper-compat (= 12), autocon
libtool, heimdal-multidev (>= 1.7~git20150920)
Build-Depends-Indep: dblatex, dh-dkms (>= 3.0.3-4~), docbook-xsl, doxygen (>=
1.8.4-1~),
xsltproc
-Rules-Requires-Root: binary-targets
+Rules-Requires-Root: no
Standards-Version: 4.7.0
Homepage: http://www.openafs.org/
Vcs-Git: https://salsa.debian.org/debian/openafs.git
diff --git a/debian/rules b/debian/rules
index 76140b3e9..7f9a713cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,14 +208,15 @@ override_dh_install-indep:
sed 's/^openafs /openafs-modules /' debian/changelog \
> debian/$(srcpkg)/usr/src/modules/$(package)/debian/changelog
chmod 755 debian/$(srcpkg)/usr/src/modules/$(package)/debian/rules
- chown -R root.src debian/$(srcpkg)
- find debian/$(srcpkg) -type d | xargs chmod 755
- find debian/$(srcpkg) -type f -perm -100 | xargs chmod 755
- find debian/$(srcpkg) -type f -not -perm -100 | xargs chmod 644
- chmod 775 debian/$(srcpkg)/usr/src/modules
- cd debian/$(srcpkg)/usr/src && find modules -print0 | LC_ALL=C sort -z
| tar --no-recursion --null -T - $(if
$(SOURCE_DATE_EPOCH),--mtime=@$(SOURCE_DATE_EPOCH)) -cf $(package).tar
- bzip2 debian/$(srcpkg)/usr/src/$(package).tar
- chmod 644 debian/$(srcpkg)/usr/src/$(package).tar.bz2
+ tar c \
+ -C debian/$(srcpkg)/usr/src \
+ --numeric-owner --owner=0 --group=0 \
+ --mode=a=rX,u+w \
+ --sort=name \
+ --mtime='@$(SOURCE_DATE_EPOCH)' \
+ --clamp-mtime \
+ modules | bzip2 -9 > debian/$(srcpkg)/usr/src/$(package).tar.bz2
+ tar tfv debian/$(srcpkg)/usr/src/$(package).tar.bz2
install -d debian/$(dkmspkg)/usr/src
mv debian/$(srcpkg)/usr/src/modules/$(package) \
debian/$(dkmspkg)/usr/src/openafs-$(VERSION)
--
2.39.5
