From 6bc50d6ed4305a88c040e98fa3d2273e1ad490cb Mon Sep 17 00:00:00 2001
From: Piotr Kubik <piotr.kubik@iopsys.eu>
Date: Tue, 2 Jan 2024 11:26:21 +0100
Subject: [PATCH] bcmkernel: Restore patching brcm binaries with RUNPATH
With patchelf update to 0.18.0 we can safely patch brcm binaries with RUNPATH
and this workaround is no longer needed.
Revert "bcmkernel: Do not patch brcm eapd, hostapd_cli and wpa_cli with RUNPATH"
This reverts commit d2e846e9f622a73bdf51e23eb0f7a99bb5dfda5c.
Revert "bcmkernel: Patch only dhd.brcm insted of symlink to it"
This reverts commit a43f86d1c761052798e5b42f240bcd27a54fa509.
Partially Remove "bcmkernel: Put libs in separate directory"
This partially reverts commit 3424be90c7acddf8ceea22c86f1e4cdd215eb01c
---
bcmkernel/scripts/rstrip_and_set_rpath.sh | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/bcmkernel/scripts/rstrip_and_set_rpath.sh b/bcmkernel/scripts/rstrip_and_set_rpath.sh
index c826973..4fdcd97 100755
--- a/bcmkernel/scripts/rstrip_and_set_rpath.sh
+++ b/bcmkernel/scripts/rstrip_and_set_rpath.sh
@@ -1,16 +1,11 @@
#!/bin/sh -eux
"$RSTRIP_SH" "$@"
-# TODO: find out why broadcom wl utility does not run after patching the RUNPATH. Maybe patchelf bug?
+
find -D exec \
"$@" \
-type f \
-not -name 'ld-linux*.so*' \
-not -name '*.sh' \
- -not -name wl.brcm \
- -not -name dhd.brcm \
- -not -name eapd.brcm \
- -not -name hostapd_cli.brcm \
- -not -name wpa_cli.brcm \
'(' \
-name '*.so' \
-or \
--
GitLab