Skip to content

Update and sync version to current version 0.140 in Debian stable

Carsten Schoenert requested to merge carsten.schoenert/initramfs-tools:pureos/latest into pureos/latest

This MR is about updating the package initramfs-tools for byzantium based on version 0.140 in Debian stable.

It's marked again as WIP as the target branch should be pureos/latest so no automatic merging via the GL UI should be done.

I'm unable to test the final binary packages on something useful, so please check the created packages in areal PureOS environment, but I expect no problems after looking into the merge of the trees as the base of PureOS specific modifications is really small and easy to look at.

The main difference between PureOS and Debian is using ${busybox:Recommends} within Depends and not as Recommends and also to suppress messages about "Possible missing firmware" if not -v is used.

$ git diff v0.140 debian/control hook-functions
diff --git a/debian/control b/debian/control
index 3768fad..173dba7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: initramfs-tools
 Section: utils
 Priority: optional
-Uploaders: Michael Prokop <mika@debian.org>, Ben Hutchings <benh@debian.org>
-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Maintainer: PureOS Maintainers <pureos-project@lists.puri.sm>
+XBSC-Oiginal-Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Build-Depends: debhelper-compat (= 12), bash-completion, shellcheck <!nocheck>
 Rules-Requires-Root: no
 Standards-Version: 4.1.5
-Vcs-Browser: https://salsa.debian.org/kernel-team/initramfs-tools
-Vcs-Git: https://salsa.debian.org/kernel-team/initramfs-tools.git
+Vcs-Browser: https://source.puri.sm/pureos/core/initramfs-tools
+Vcs-Git: https://source.puri.sm/pureos/core/initramfs-tools.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/kernel-team/initramfs-tools
+XSBC-Original-Vcs-Git: https://salsa.debian.org/kernel-team/initramfs-tools.git
 
 Package: initramfs-tools
 Architecture: all
@@ -25,10 +27,10 @@ Description: generic modular initramfs generator (automation)
 Package: initramfs-tools-core
 Architecture: all
 Multi-Arch: foreign
-Recommends: ${busybox:Recommends}, pigz
-Depends: klibc-utils (>= 2.0.4-8~), cpio (>= 2.12), kmod, udev, coreutils (>= 8.24), logsave | e2fsprogs (<< 1.45.3-1~), ${misc:Depends}
+Recommends: pigz
+Depends: klibc-utils (>= 2.0.4-8~), cpio (>= 2.12), kmod, udev, coreutils (>= 8.24), logsave | e2fsprogs (<< 1.45.3-1~), ${misc:Depends}, ${busybox:Recommends}
 Suggests: bash-completion
-Breaks: initramfs-tools (<< 0.121~), ${busybox:Breaks}
+Breaks: initramfs-tools (<< 0.121~), ${busybox:Breaks}, busybox-initramfs (<< 1:1.27.2-3)
 Replaces: initramfs-tools (<< 0.121~)
 Description: generic modular initramfs generator (core tools)
  This package contains the mkinitramfs program that can be used to
diff --git a/hook-functions b/hook-functions
index 9c82fb2..cc7e07f 100644
--- a/hook-functions
+++ b/hook-functions
@@ -116,6 +116,10 @@ manual_add_modules()
                                if [ ! -e /proc/modules ] ; then
                                        continue
                                fi
+                               # shellcheck disable=SC2154
+                               if [ "${verbose}" != "y" ]; then
+                                       continue
+                               fi
 
                                kmod_modname="${kmod##*/}"
                                kmod_modname="${kmod_modname%%.*}"

@sebastian.krzyszkowiak @matthias.klumpp @jeremiah.foster @guido.gunther

Merge request reports