From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 18/28] make.sh: Refactor stripper
Date: Fri, 04 Feb 2022 16:47:38 +0000
Message-ID: <20220204164748.315559-18-michael.tremer@ipfire.org>
In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3253238599234871309=="
List-Id: <development.lists.ipfire.org>

--===============3253238599234871309==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This should *actually* exclude everything we want to exclude and
*actually* strip everything to the maximum.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/strip    | 21 +++++-----------
 make.sh      |  9 +++++--
 src/stripper | 71 ++++++++++++++++++++++++++--------------------------
 3 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/lfs/strip b/lfs/strip
index 48e698a7c..466dfd9d5 100644
--- a/lfs/strip
+++ b/lfs/strip
@@ -29,16 +29,6 @@ VER =3D ipfire
 THISAPP    =3D strip
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
-ifeq "$(TOOLCHAIN)" "1"
-	SHELL =3D /bin/bash
-	STRIP =3D /usr/bin/strip
-	ROOT =3D $(TOOLS_DIR)
-else
-	SHELL =3D $(TOOLS_DIR)/bin/bash
-	STRIP =3D $(TOOLS_DIR)/bin/strip
-	ROOT =3D /
-endif
-
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
@@ -56,18 +46,19 @@ md5 :
 ############################################################################=
###
=20
 $(TARGET) :
+ifeq "$(TOOLCHAIN)" "1"
+	# Strip everything in the toolchain
+	$(DIR_SRC)/src/stripper $(TOOLS_DIR)
+else
 	# Don't strip VDR binaries, because they use a weird plugin system
 	# which does not work when unneeded symbols get stripped from
 	# /usr/sbin/vdr.
-	STRIP=3D$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper \
-		$(ROOT) \
+	$(DIR_SRC)/src/stripper / \
 		--exclude=3D$(TOOLS_DIR) \
-		--exclude=3D/dev \
-		--exclude=3D/proc \
-		--exclude=3D/sys \
 		--exclude=3D/tmp \
 		--exclude=3D/usr/src \
 		--exclude=3D/usr/lib/vdr \
 		--exclude=3D/usr/sbin/vdr \
 		--exclude=3D/var/tmp \
 		--exclude=3D/usr/lib/go
+endif
diff --git a/make.sh b/make.sh
index 57e185312..356173065 100755
--- a/make.sh
+++ b/make.sh
@@ -556,6 +556,11 @@ enterchroot() {
=20
 	local PATH=3D"${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOOLS=
_DIR}/bin"
=20
+	# Prepend any custom changes to PATH
+	if [ -n "${CUSTOM_PATH}" ]; then
+		PATH=3D"${CUSTOM_PATH}:${PATH}"
+	fi
+
 	PATH=3D"${PATH}" chroot ${LFS} env -i \
 		HOME=3D"/root" \
 		TERM=3D"${TERM}" \
@@ -695,7 +700,7 @@ lfsmake2() {
 	local PS1=3D'\u:\w$ '
=20
 	enterchroot \
-		${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
+		bash -x -c "cd /usr/src/lfs && \
 			make -f $* \
 			LFS_BASEDIR=3D/usr/src install" \
 		>> ${LOGFILE} 2>&1 &
@@ -1693,7 +1698,7 @@ buildinstaller() {
   lfsmake2 memtest
   lfsmake2 installer
   # use toolchain bash for chroot to strip
-  EXTRA_PATH=3D${TOOLS_DIR}/bin/ lfsmake2 strip
+  CUSTOM_PATH=3D"${TOOLS_DIR}/bin" lfsmake2 strip
 }
=20
 buildpackages() {
diff --git a/src/stripper b/src/stripper
index 6f449bb39..d1739b28c 100755
--- a/src/stripper
+++ b/src/stripper
@@ -1,49 +1,58 @@
 #!/usr/bin/env bash
=20
-dirs=3D""
-excludes=3D"/dev /proc /sys /run"
+paths=3D()
+excludes=3D()
=20
 while [ $# -gt 0 ]; do
 	case "${1}" in
 		--exclude=3D*)
-			excludes=3D"${excludes} ${1#*=3D}"
+			excludes+=3D( "!" "-path" "${1#*=3D}/*" )
 			;;
 		*)
-			dirs=3D"${dirs} ${1}"
+			paths+=3D( "${1}" )
 			;;
 	esac
 	shift
 done
=20
 function _strip() {
-	local file=3D${1}
-	local strip=3D"${STRIP-strip}"
+	local file=3D"${1}"
+	local args=3D()
=20
-	local exclude l
-	for exclude in ${excludes}; do
-		l=3D${#exclude}
-		if [ "${file:0:${l}}" =3D "${exclude}" ]; then
-			return 0
-		fi
-	done
+	# Fetch the filetype
+	local type=3D"$(readelf -h "${file}" 2>/dev/null)"
=20
-	# Fetch any capabilities
-	local capabilities=3D"$(getfattr --no-dereference --name=3D"security.capabi=
lity" \
-		--absolute-names --dump "${file}" 2>/dev/null)"
+	case "${type}" in
+		# Libraries and Relocatable binaries
+		*Type:*"DYN (Shared object file)"*)
+			args+=3D( "--strip-all" )
+			;;
=20
-	local cmd=3D( "${strip}" )
+		# Binaries
+		*Type:*"EXEC (Executable file)"*)
+			args+=3D( "--strip-all" )
+			;;
=20
-	case "$(file -bi ${file})" in
-		application/x-archive*)
-			cmd+=3D( "--strip-debug" "--remove-section=3D.comment" "--remove-section=
=3D.note" )
+		# Static libraries
+		*Type:*"REL (Relocatable file)"*)
+			args+=3D( "--strip-debug" "--remove-section=3D.comment" "--remove-section=
=3D.note" )
 			;;
+
+		# Skip any unrecognised files
 		*)
-			cmd+=3D( "--strip-all" )
+			return 0
 			;;
 	esac
=20
+	# Fetch any capabilities
+	local capabilities=3D"$(getfattr --no-dereference --name=3D"security.capabi=
lity" \
+		--absolute-names --dump "${file}" 2>/dev/null)"
+
 	echo "Stripping ${file}..."
-	${cmd[*]} ${file}
+	if ! strip "${args[@]}" "${file}"; then
+		return 1
+	fi
+
=20
 	# Restore capabilities
 	if [ -n "${capabilities}" ]; then
@@ -51,18 +60,8 @@ function _strip() {
 	fi
 }
=20
-for dir in ${dirs}; do
-	# Strip shared objects.
-	find ${dir} -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
-		| file -N -f - | sed -n -e 's/^\(.*\):[   ]*.*ELF.*, not stripped.*/\1/p' |
-		while read file; do
-			_strip ${file} || exit $?
-		done || exit $?
-
-	# Strip static archives.
-	find ${dir} -name \*.a -a -exec file {} \; \
-		| grep 'current ar archive' | sed -n -e 's/^\(.*\):[ 	]*current ar archive=
/\1/p' |
-		while read file; do
-			_strip ${file} || exit $?
-		done || exit $?
+for path in ${paths[@]}; do
+	for file in $(find / -xdev "${excludes[@]}" -type f \( -perm -0100 -or -per=
m -0010 -or -perm -0001 \) 2>/dev/null); do
+		_strip "${file}" || exit $?
+	done
 done
--=20
2.30.2


--===============3253238599234871309==--