Merging debian version 060+5-7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 57 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index a4e71be..4ccbfc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+dracut (060+5-7) unstable; urgency=low
+
+  * control: update package depends name
+  * add lintian override
+
+ -- Thomas Lange <lange@debian.org>  Mon, 01 Apr 2024 23:01:58 +0200
+
+dracut (060+5-2) unstable; urgency=low
+
+  * set --systemdsystemunitdir from pkg-config, MR #32, Closes: #1057927
+  * split dracut-install into separate package for initramfs-tools, MR #27
+  * enable autopkgtest test suite, MR #24
+
+ -- Thomas Lange <lange@debian.org>  Sun, 31 Mar 2024 19:05:19 +0200
+
 dracut (060+5-2~exp1~progress7.99u1) graograman-backports; urgency=low
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index c9c1b33..1f8b96e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Thomas Lange <lange@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 12), debhelper, asciidoc-base, xsltproc, docbook-xsl, docbook-xml, quilt, libkmod-dev, pkg-config
+Build-Depends: debhelper-compat (= 12), debhelper, asciidoc-base, xsltproc, docbook-xsl, docbook-xml, quilt, libkmod-dev, pkgconf, systemd-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/dracut
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/dracut
@@ -28,8 +28,8 @@ Description: Initramfs generator using udev
 Package: dracut-core
 Architecture: any
 Multi-Arch: foreign
-Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm, console-setup, binutils, systemd, pigz, pkg-config
-Depends: cpio, kmod, udev, kpartx, libkmod2, e2fsprogs, ${shlibs:Depends}, ${misc:Depends}
+Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm, console-setup, binutils, systemd, pigz, pkgconf
+Depends: cpio, dracut-install, kmod, udev, kpartx, libkmod2, e2fsprogs, ${shlibs:Depends}, ${misc:Depends}
 Breaks: dracut-network (<< 057+157-2), dracut-live (<< 059-2)
 Replaces: dracut-network (<< 057+157-2), dracut-live (<< 059-2)
 Description: dracut is an event driven initramfs infrastructure (core tools)
@@ -43,6 +43,15 @@ Description: dracut is an event driven initramfs infrastructure (core tools)
  Having the root on MD, LVM2, LUKS is supported as well as NFS, iSCSI,
  NBD and FCOE with dracut-network.
 
+Package: dracut-install
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: dracut-core (<< 059-5~)
+Replaces: dracut-core (<< 059-5~)
+Description: dracut is an event driven initramfs infrastructure (dracut-install)
+ This package just contains the dracut-install command to be used by
+ initramfs generating tools.
+
 Package: dracut-network
 Architecture: all
 Recommends: nfs-common, open-iscsi, nbd-client, curl
diff --git a/debian/dracut-core.install b/debian/dracut-core.install
index e2197d9..7822ca6 100644
--- a/debian/dracut-core.install
+++ b/debian/dracut-core.install
@@ -5,11 +5,9 @@ usr/lib/dracut/dracut-functions
 usr/lib/dracut/dracut-functions.sh
 usr/lib/dracut/dracut-init.sh
 usr/lib/dracut/dracut-initramfs-restore
-usr/lib/dracut/dracut-install
 usr/lib/dracut/dracut-util
 usr/lib/dracut/skipcpio
 usr/lib/dracut/dracut-logger.sh
-lib/systemd/system
 usr/share/bash-completion/completions
 usr/share/pkgconfig/dracut.pc
 usr/lib/dracut/dracut-version.sh
diff --git a/debian/dracut-install.install b/debian/dracut-install.install
new file mode 100644
index 0000000..4ed419f
--- /dev/null
+++ b/debian/dracut-install.install
@@ -0,0 +1 @@
+usr/lib/dracut/dracut-install
diff --git a/debian/dracut-install.lintian-overrides b/debian/dracut-install.lintian-overrides
new file mode 100644
index 0000000..4bf6161
--- /dev/null
+++ b/debian/dracut-install.lintian-overrides
@@ -0,0 +1,2 @@
+# one single directory for modules is needed, see https://github.com/dracutdevs/dracut/issues/2485
+dracut-install: executable-in-usr-lib [usr/lib/dracut/*]
diff --git a/debian/dracut-network.lintian-overrides b/debian/dracut-network.lintian-overrides
index 114327b..30e915b 100644
--- a/debian/dracut-network.lintian-overrides
+++ b/debian/dracut-network.lintian-overrides
@@ -1,2 +1,3 @@
 # one single directory for modules is needed, see https://github.com/dracutdevs/dracut/issues/2485
 dracut-network: executable-in-usr-lib [usr/lib/dracut/*]
+dracut-network: non-etc-file-marked-as-conffile remove-on-upgrade /etc/dracut.conf.d/11-ifcfg.conf
diff --git a/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch b/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch
index 0dc6e44..3055a51 100644
--- a/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch
+++ b/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch
@@ -10,9 +10,11 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
  test/test-functions | 12 ------------
  4 files changed, 5 insertions(+), 19 deletions(-)
 
+diff --git a/Makefile b/Makefile
+index 333cd68..10a8e63 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -264,7 +264,6 @@
+@@ -264,7 +264,6 @@ endif
  endif
  
  check: all syncheck
@@ -20,9 +22,11 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
  	@$(MAKE) -C test check
  
  testimage: all
+diff --git a/docs/HACKING.md b/docs/HACKING.md
+index 6a19434..2e3d614 100644
 --- a/docs/HACKING.md
 +++ b/docs/HACKING.md
-@@ -253,27 +253,27 @@
+@@ -253,27 +253,27 @@ For the testsuite to pass, you will have to install at least the software packag
  mentioned in the `test/container` Dockerfiles.
  
  ```
@@ -55,6 +59,8 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
 +$ make run
  ```
  to run the test without doing the setup.
+diff --git a/test/Makefile b/test/Makefile
+index dfaa450..518e7d6 100644
 --- a/test/Makefile
 +++ b/test/Makefile
 @@ -1,7 +1,6 @@
@@ -65,9 +71,11 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
  	@{ \
  		[ -d $@ ] || exit 0; \
  		[ -f $@/Makefile ] || exit 0; \
+diff --git a/test/test-functions b/test/test-functions
+index f76d930..f28e30a 100644
 --- a/test/test-functions
 +++ b/test/test-functions
-@@ -52,15 +52,6 @@
+@@ -52,15 +52,6 @@ COLOR_FAILURE='\033[0;31m'
  COLOR_WARNING='\033[0;33m'
  COLOR_NORMAL='\033[0;39m'
  
@@ -83,7 +91,7 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
  # generate qemu arguments for named raw disks
  #
  # qemu_add_drive_args <index> <args> <filename> <id-name> [<bootindex>]
-@@ -122,13 +113,11 @@
+@@ -122,13 +113,11 @@ test_marker_check() {
  while (($# > 0)); do
      case $1 in
          --run)
@@ -97,7 +105,7 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
              echo "TEST SETUP: $TEST_DESCRIPTION"
              test_check && test_setup
              exit $?
-@@ -141,7 +130,6 @@
+@@ -141,7 +130,6 @@ while (($# > 0)); do
              exit $?
              ;;
          --all)
diff --git a/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch b/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
index a149d7c..2ff8adf 100644
--- a/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
+++ b/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
@@ -10,18 +10,22 @@ Origin: upstream, https://github.com/dracutdevs/dracut/pull/2549
  test/TEST-04-FULL-SYSTEMD/test.sh      | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
+diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh
+index b7261b5..055aa75 100755
 --- a/test/TEST-04-FULL-SYSTEMD/test-init.sh
 +++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh
-@@ -37,5 +37,4 @@
+@@ -37,5 +37,4 @@ if getargbool 0 rd.shell; then
      setsid $CTTY sh -i
  fi
  echo "Powering down."
 -systemctl --no-block poweroff
 -exit 0
 +poweroff -f
+diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
+index 160104f..a6d5345 100755
 --- a/test/TEST-04-FULL-SYSTEMD/test.sh
 +++ b/test/TEST-04-FULL-SYSTEMD/test.sh
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ test_setup() {
  
      # Create what will eventually be our root filesystem onto an overlay
      "$DRACUT" -l --keep --tmpdir "$TESTDIR" \
diff --git a/debian/rules b/debian/rules
index bce1c66..b6f1f77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DRACUT_MAIN_VERSION=$(DEB_VERSION_UPSTREAM_REVISION)
 export DRACUT_FULL_VERSION=$(DEB_VERSION)
 
+deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --systemdsystemunitdir=/lib/systemd/system --libdir=/usr/lib
+	dh_auto_configure -- --systemdsystemunitdir=/$(deb_systemdsystemunitdir) --libdir=/usr/lib
 	$(SHELL) debian/fix-revdate
 	mv dracut-version.sh dracut-version.sh.orig
 	echo '#!/bin/sh' > dracut-version.sh
@@ -40,6 +42,10 @@ endif
 
 override_dh_auto_test:
 
+override_dh_install:
+	dh_install
+	dh_install -pdracut-core $(deb_systemdsystemunitdir)
+
 override_dh_clean:
 	if test -e dracut-version.sh.orig ; then \
 	   mv -f dracut-version.sh.orig dracut-version.sh ;\