Merge ~hyask/ubuntu/+source/klibc:master into ubuntu/+source/klibc:ubuntu/devel

[Skia]

As discussed, this is a request for sponsorship.

Fixes https://bugs.launchpad.net/ubuntu/+source/klibc/+bug/2046336

[Paride Legovini (paride)]

This is basically OK, the only thing that is off are the meta-tags in the 69c40f46cc6dd commit message. Basically they need to be in separate lines:

Closes: #12345
LP: #12345

Note that the Debian one (the Closes:) also needs the # sign. This way dch will generate the changelog entry correctly. Your changelog entry currently has:

  (Closes: 1055694, #2046336)

but that won't close the LP bug because it doesn't match the `LP: #nnnnnn` format.

Adding the Debian bug reference won't change anything in practice, but I think it's nice to have a reference to the upstream Debian bug in the changelog, so +1 for that.

review: Needs Fixing

[Paride Legovini (paride)]

review: Approve

[Paride Legovini (paride)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading klibc_2.0.13-2ubuntu1.dsc: done.
  Uploading klibc_2.0.13-2ubuntu1.debian.tar.xz: done.
  Uploading klibc_2.0.13-2ubuntu1_source.buildinfo: done.
  Uploading klibc_2.0.13-2ubuntu1_source.changes: done.

diff --git a/debian/changelog b/debian/changelog
index 3c45edb..812a3bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+klibc (2.0.13-2ubuntu1) noble; urgency=medium
+
+  [ Klaus Frank ]
+  * d/i/h/klibc-utils: Fix compatibility issue with busybox and improve verbose debug output.
+    (Closes: #1055694) (LP: #2046336)
+
+ -- Florent 'Skia' Jacquet <[e-mail]>  Fri, 15 Dec 2023 16:08:42 +0100
+
 klibc (2.0.13-2) unstable; urgency=medium
 
   * d/rules: Handle loong64 architecture (thanks to Peng Fan)
diff --git a/debian/control b/debian/control
index 42699cb..90c376e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: klibc
 Priority: optional
-Maintainer: Debian Kernel Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Kernel Team <[e-mail]>
 Uploaders: Ben Hutchings <[e-mail]>, maximilian attems <[e-mail]>
 Build-Depends: debhelper-compat (= 12), linux-libc-dev, m4 [sparc]
 Section: libs
diff --git a/debian/initramfs-tools/hooks/klibc-utils b/debian/initramfs-tools/hooks/klibc-utils
index 18e438b..dfd7545 100755
--- a/debian/initramfs-tools/hooks/klibc-utils
+++ b/debian/initramfs-tools/hooks/klibc-utils
@@ -26,11 +26,28 @@ for src in /usr/lib/klibc/bin/*; do
 		# Don't install; these will not be needed
 		;;
 	*)
-		# Don't install commands that already exist in /bin or /sbin
-		if ! [ -e "${DESTDIR}/sbin/$command" ]; then
-			cp -pnL "$src" "${DESTDIR}/bin"
+		# Don't install commands that already exist in /bin
+		if ! [ -e "${DESTDIR}/bin/$command" ]; then
+			if [ "${verbose?}" = "y" ]; then
+				echo "Adding binary-link ${DESTDIR}/bin/$command"
+			fi
+			cp -pnL "${src}" "${DESTDIR}/bin"
+		else
+			# Suppress our log output when busybox is enabled and
+			# it belongs to busybox
+			# We don't want to write a logentry for this when
+			# the user configured busybox to take priority
+			if [ "${BUSYBOX}" = "n" ] || [ -z "${BUSYBOXDIR}" ] || [ "$(basename $(realpath "${DESTDIR}/bin/$command"))" != "busybox" ]; then
+				if [ "${verbose?}" = "y" ]; then
+					echo "Skipping existing ${DESTDIR}/bin/$command"
+				fi
+			fi
 		fi
 		;;
 	esac
 done
+
+if [ "${verbose?}" = "y" ]; then
+	echo "Adding libraries-link ${DESTDIR}/lib/klibc-*.so"
+fi
 cp -pL /lib/klibc-*.so "${DESTDIR}/lib"