[patch] Patch to fix the build for cryptsetup and util-linux

genkernel-4.2.6-utils-slibtool.patch (text/plain), 2.60 KB, created by orbea on 2022-03-25 20:09:49 UTC

From c0463b50e3349ae6c08f80468e7848be554a7651 Mon Sep 17 00:00:00 2001
From: orbea <[e-mail]>
Date: Thu, 24 Mar 2022 11:43:40 -0700
Subject: [PATCH 1/2] gkbuild/util-linux: Install the correct binaries with
 slibtool

Signed-off-by: orbea <[e-mail]>
---
 gkbuilds/util-linux.gkbuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index 40ea1fb..476695e 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -47,11 +47,16 @@ src_install() {
 
 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
 
-	cp -a blkid.static "${D}"/sbin/blkid \
-		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
+	# Ensure only the binaries are installed and not a similarly named wrapper script
+	find "${S}" -type f -name 'blkid.static' -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' cp -a '{}' "${D}"/sbin/blkid ||
+		die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
 
-	cp -a switch_root "${D}"/sbin/switch_root \
-		|| die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
+	find "${S}" -type f -name 'switch_root' -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' cp -a '{}' "${D}"/sbin/switch_root ||
+		die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
 
 	local sbin
 	for sbin in \
-- 
2.34.1

From 5c2e306a61b28569a27b258e23510f4223333078 Mon Sep 17 00:00:00 2001
From: orbea <[e-mail]>
Date: Thu, 24 Mar 2022 13:17:07 -0700
Subject: [PATCH 2/2] gkbuild/cryptsetup: Install the correct binaries with
 slibtool

Signed-off-by: orbea <[e-mail]>
---
 gkbuilds/cryptsetup.gkbuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index 007874d..22b2bab 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -34,8 +34,11 @@ src_install() {
 		"${D}"/sbin/* \
 		"${D}"/usr/share/
 
-	cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
-		|| die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
+	# Ensure only the binaries are installed and not a similarly named wrapper script
+	find "${S}" -type f -name 'cryptsetup.static' -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' cp -a '{}' "${D}"/sbin/cryptsetup ||
+		die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
 
 	"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
 		|| die "Failed to strip '${D}/sbin/cryptsetup'!"
-- 
2.34.1