Merge ~xnox/ubuntu/+source/initramfs-tools:libgcc_s into ubuntu/+source/initramfs-tools:ubuntu/devel

[Dimitri John Ledkov]

Reliable libgcc_s inclusion

[Steve Langasek (vorlon)]

Can you get agreement on this upstream in Debian first?

Unmerged commits

179c6fc... by Dimitri John Ledkov on 2020-06-06

Properly fixup copying libgcc_s library into the initrd. LP: #1880853 Implemented differently from "[f2ac13e] hook-functions: copy_exec: Copy libgcc_s.so.1 along with libpthread.so.* (Closes: #950254)". To avoid circular shared library dependencies between compiler and libc, libpthreads chooses to dlopen libgcc_s, instead of linking against it. However, we have no way to parse/know what it needs. And even when we hardcode to include libgcc_s1, we don't have a way to know which libgcc_s1 is needed on a given system and from which path to include it. But there is a hook-function to copy a binary and all of its shared library dependencies. Thus create a stub empty executable, with shared linking against pthreads and gcc_s1 and always include it in the initrd. This way at initrd creation time, ldd is used to correctly resolve these shared library dependencies and correctly copy them into the initrd. This removes hardcoding paths as to where these libraries must be copied from on the host.

598dcc8... by Dimitri John Ledkov on 2020-05-30

0.137ubuntu9 (patches unapplied)

Imported using git-ubuntu import.

b9c21a2... by Dimitri John Ledkov on 2020-05-30

0.137ubuntu8 (patches unapplied)

Imported using git-ubuntu import.

a9299e3... by Dimitri John Ledkov on 2020-05-29

0.137ubuntu7 (patches unapplied)

Imported using git-ubuntu import.

76f57d4... by Gianfranco Costamagna on 2020-05-27

0.137ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

359f422... by Dimitri John Ledkov on 2020-05-26

0.137ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

bac1590... by Gianfranco Costamagna on 2020-05-20

0.137ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

ebec39e... by Gianfranco Costamagna on 2020-05-17

0.137ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

7f599b3... by Ben Hutchings on 2020-04-28

Import patches-unapplied version 0.137 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 57216af3f25f1f18f09f915d1c3e5799772d1a63

New changelog entries:
  [ Ben Hutchings ]
  * [1b28d25] Document copy_exec as usable for shared libraries
  * [f2ac13e] hook-functions: copy_exec: Copy libgcc_s.so.1 along with
    libpthread.so.* (Closes: #950254)
  * [d96228a] hook-functions: copy_exec: Correct verbose log message for
    symlinks
  * [dd5fb36] hook-functions: Factor out device class walking into a function
  * [14a00af] hook-functions: Don't add backlight modules if we have generic
    fb device (Closes: #955347)
  * [f6133e1] Fix new shellcheck warnings around unquoted parameter expansion
    (Closes: #958851)
  [ AP ]
  * [857042c] hook-functions: Search for firmware under /lib/firmware/updates
    (Closes: #956663)

57216af... by Ben Hutchings on 2020-01-18

Import patches-unapplied version 0.136 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 42dd22db1f2197e9dee4ef8c3e4131cc696951db

New changelog entries:
  [ Mathieu Malaterre ]
  * [90bd459] Update to new name for kernel module therm_pm72
  [ Alper Nebi Yasak ]
  * [ded7214] hook-functions: Handle dw_mmc-rockchip hidden dependency on
    rockchip-io-domain
  * [da85190] hook-functions: Include modules for Chromebook Plus display
  [ Ben Hutchings ]
  * [afd2668] debian/tests/control: Mark shellcheck test as superficial
  * [9d8b690] mkinitramfs: Remove workaround for old udev versions
  * [2b55aca] mkinitramfs: Remove special case for Arm OABI ports
  * [a9e5169] mkinitramfs: Remove armhf dynamic linker hack
  * [b19b6f3] debian/rules: Suppress execution of dh_installinitramfs
  * [8330bcd] mkinitramfs: Use cp -p option for ld.so.conf* instead of -aZ
  * [15fd713] initramfs-tools(7): Change example to use copy_exec instead of cp
  * [c2d589e] Revert "mkinitramfs: check if initramfs has a shell"
  * [835d584] mkinitramfs: Copy modules.builtin.bin into initramfs
    (Closes: #948257)
  * [0012977] init: Remove special case for kernel parameter resume=UUID=...
  * [897ab77] update-initramfs: Make "-c -k all" options useful again
    (Closes: #926401)
  * [d6c6eec] init: Mount /dev with "exec" option if v86d is present
    (Closes: #940171)
  * [a9e73b5] hook-functions: Drop ext4dev from filesystem module list
  * [41d9ceb] mkinitramfs: Enable multihreaded xz compression (Closes: #942144)
  [ Alexander Volkov ]
  * [e34affa] Don't require build dependency on shellcheck when nocheck profile
    is enabled
  [ Johannes 'josch' Schauer ]
  * [e2ad678] hook-functions: preloaded libraries should not end up in the
    initramfs (Closes: #944929)
  [ Debian Janitor ]
  * [a1e17fc] Bump debhelper from old 9 to 12.
  * [4d86d1a] Set debhelper-compat version in Build-Depends.
  [ Romain Perier ]
  * [4df27e2] hook-functions: Add f2fs as base in auto_add_modules
  [ Christian Göttsche ]
  * [0db5752] Do not copy SELinux context in mkinitramfs (Closes: #948365)
  [ Topi Miettinen ]
  * [55afeec] Tighten permissions for /run/initramfs

diff --git a/debian/changelog b/debian/changelog
index cfc177f..56c17a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+initramfs-tools (0.137ubuntu10) groovy; urgency=medium
+
+  * Properly fixup copying libgcc_s library into the initrd. LP: #1880853
+    Implemented differently from "[f2ac13e] hook-functions: copy_exec:
+    Copy libgcc_s.so.1 along with libpthread.so.* (Closes: #950254)". To
+    avoid circular shared library dependencies between compiler and libc,
+    libpthreads chooses to dlopen libgcc_s, instead of linking against
+    it. However, we have no way to parse/know what it needs. And even when
+    we hardcode to include libgcc_s1, we don't have a way to know which
+    libgcc_s1 is needed on a given system and from which path to include
+    it. But there is a hook-function to copy a binary and all of its
+    shared library dependencies. Thus create a stub empty executable, with
+    shared linking against pthreads and gcc_s1 and always include it in
+    the initrd. This way at initrd creation time, ldd is used to correctly
+    resolve these shared library dependencies and correctly copy them into
+    the initrd. This removes hardcoding paths as to where these libraries
+    must be copied from on the host.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 05 Jun 2020 13:38:11 +0100
+
 initramfs-tools (0.137ubuntu9) groovy; urgency=medium
 
   * Document add_mountroot_fail_hook correctly.
diff --git a/debian/initramfs-tools-bin.install b/debian/initramfs-tools-bin.install
index 9d63a93..bdc60f7 100644
--- a/debian/initramfs-tools-bin.install
+++ b/debian/initramfs-tools-bin.install
@@ -1,2 +1,3 @@
 src/wait-for-root	usr/lib/initramfs-tools/bin
 src/rzscontrol		usr/lib/initramfs-tools/bin
+src/gcc_s1-stub	usr/lib/initramfs-tools/bin
diff --git a/hook-functions b/hook-functions
index d80fe32..0517140 100644
--- a/hook-functions
+++ b/hook-functions
@@ -213,13 +213,6 @@ copy_exec() {
 			x="${nonoptlib}"
 		fi
 
-		# Handle common dlopen() dependency (Debian bug #950254)
-		case "${x}" in
-		*/libpthread.so.*)
-			copy_exec "${x%/*}/libgcc_s.so.1" || copy_exec "${x%/*}/../libgcc_s.so.1" || return
-			;;
-		esac
-
 		copy_file binary "${x}" || {
 			ret=$?
 			[ ${ret} = 1 ] || return $((ret - 1))
diff --git a/mkinitramfs b/mkinitramfs
index 637f1d6..2883a27 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -360,6 +360,9 @@ fi
 touch "${DESTDIR}/etc/fstab"
 ln -s /proc/mounts "${DESTDIR}/etc/mtab"
 
+# Install libc6, pthreads, and dlopened gcc_s.so.1 (Debian bug #950254)
+copy_exec /usr/lib/initrmafs-tools/bin/gcc_s1-stub /usr/lib/initrmafs-tools/bin/gcc_s1-stub
+
 # install wait-for-root binary.
 copy_exec /usr/lib/initramfs-tools/bin/wait-for-root /sbin
 
diff --git a/src/Makefile b/src/Makefile
index c7ac39e..6210775 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ LDFLAGS =
 
 
 .PHONY: all
-all: wait-for-root rzscontrol
+all: wait-for-root rzscontrol gcc_s1-stub
 
 wait-for-root: wait-for-root.o
 	$(CC) $(LDFLAGS) -o $@ $< $(UDEV_LIBS)
@@ -16,6 +16,9 @@ wait-for-root: wait-for-root.o
 rzscontrol: rzscontrol.o
 	$(CC) $(LDFLAGS) -o $@ $<
 
+gcc_s1-stub:
+	gcc -Wl,--no-as-needed -shared -pthread -l:libgcc_s.so.1 -o $@
+
 .PHONY: clean
 clean:
-	rm -f wait-for-root.o wait-for-root rzscontrol.o rzscontrol core *~
+	rm -f wait-for-root.o wait-for-root rzscontrol.o rzscontrol gcc_s1-stub core *~