X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fstripper;h=f121d35919fb967c6469c54b32d4f791ea631480;hb=HEAD;hp=2b4feafe9063c50bf0c01795bd8ea887fcf21e19;hpb=31901da1edb401590960558b61e31ddd9fda89c1;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/stripper b/src/stripper
index 2b4feafe90..4014f03a4f 100755
--- a/src/stripper
+++ b/src/stripper
@@ -1,57 +1,80 @@
-#!/tools/bin/bash
+#!/usr/bin/env bash
 
-dirs=""
-excludes="/dev /proc /sys /run"
+paths=()
+excludes=()
+strip="strip"
+break_on_error="1"
 
 while [ $# -gt 0 ]; do
 	case "${1}" in
+		--strip=*)
+			strip="${1#*=}"
+			;;
 		--exclude=*)
-			excludes="${excludes} ${1#*=}"
+			if [ -n "${1#*=}" ]; then
+				excludes+=( "!" "-path" "${1#*=}" "!" "-path" "${1#*=}/*" )
+			fi
+			;;
+		--ignore-errors)
+			break_on_error="0"
 			;;
 		*)
-			dirs="${dirs} ${1}"
+			paths+=( "${1}" )
 			;;
 	esac
 	shift
 done
 
 function _strip() {
-	local file=${1}
-	local cmd="${STRIP-strip}"
+	local file="${1}"
+	local args=()
 
-	local exclude l
-	for exclude in ${excludes}; do
-		l=${#exclude}
-		if [ "${file:0:${l}}" = "${exclude}" ]; then
-			return 0
-		fi
-	done
+	# Fetch the filetype
+	local type="$(readelf -h "${file}" 2>/dev/null)"
+
+	case "${type}" in
+		# Libraries and Relocatable binaries
+		*Type:*"DYN (Shared object file)"*)
+			args+=( "--strip-all" )
+			;;
+
+		*Type:*"DYN (Position-Independent Executable file)"*)
+			args+=( "--strip-all" )
+			;;
 
-	case "$(file -bi ${file})" in
-		application/x-sharedlib*|application/x-archive*)
-			cmd="${cmd} --strip-debug --remove-section=.comment --remove-section=.note"
+		# Binaries
+		*Type:*"EXEC (Executable file)"*)
+			args+=( "--strip-all" )
 			;;
+
+		# Static libraries
+		*Type:*"REL (Relocatable file)"*)
+			args+=( "--strip-debug" "--remove-section=.comment" "--remove-section=.note" )
+			;;
+
+		# Skip any unrecognised files
 		*)
-			cmd="${cmd} --strip-unneeded"
+			return 0
 			;;
 	esac
 
+	# Fetch any capabilities
+	local capabilities="$(getfattr --no-dereference --name="security.capability" \
+		--absolute-names --dump "${file}" 2>/dev/null)"
+
 	echo "Stripping ${file}..."
-	${cmd} ${file}
+	if ! "${strip}" "${args[@]}" "${file}"; then
+		return ${break_on_error}
+	fi
+
+	# Restore capabilities
+	if [ -n "${capabilities}" ]; then
+		setfattr --no-dereference --restore=<(echo "${capabilities}")
+	fi
 }
 
-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}
-		done
-
-	# 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}
-		done
+for path in ${paths[@]}; do
+	for file in $(find -H "${path}" -xdev "${excludes[@]}" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) 2>/dev/null); do
+		_strip "${file}" || exit $?
+	done
 done