Remove no longer needed HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES

build/scripts/build_haiku_image

@@ -37,7 +37,6 @@ set -o errexit
 # The following is only for cd types:
 # generate_attribute_stores
 # isCD
-# stripCommand
 #
 if [ $# -gt 0 ]; then
 	. $1
@@ -148,27 +147,12 @@ else
 fi
 
 
-stripDebugInfo()
-{
-	file="$1"
-
-	# Determine whether the file is an ELF file by checking the ELF signature,
-	# or at least the printable characters.
-	elfMarker=`dd "if=$file" bs=1 skip=1 count=3 2> /dev/null`
-	if [ "$elfMarker" = 'ELF' ]; then
-		# make user-writable first -- some files aren't
-		chmod u+w "$file"
-		"$stripCommand" --strip-debug "$file"
-	fi
-}
-
 extractFile()
 {
-	# extractFile <archive> <directory> <extractedSubDir> <stripDebugSymbols>
+	# extractFile <archive> <directory> <extractedSubDir>
 	archiveFile=$1
 	targetExtractedDir=$2
 	extractedSubDir=$3
-	stripDebugSymbols=$4
 
 	extractDir=$tmpDir/extract
 	$rmAttrs -rf "$extractDir"
@@ -205,24 +189,6 @@ extractFile()
 		rm $extractDir/.OptionalPackageDescription
 	fi
 
-	if [ "$stripDebugSymbols" = "1" ]; then
-		# strip executables in common/bin
-		if [ -d $extractDir/common/bin ]; then
-			for file in `find $extractDir/common/bin -type f -a -perm +100 \
-					-a -size +1k`; do
-				stripDebugInfo "$file"
-			done
-		fi
-
-		# strip libraries in common/lib
-		if [ -d $extractDir/common/lib ]; then
-			for file in `find $extractDir/common/lib -type f -a -size +1k \
-					-a -name lib\*`; do
-				stripDebugInfo "$file"
-			done
-		fi
-	fi
-
 	$cp -r "${sPrefix}$extractDir/$extractedSubDir/." \
 		"${tPrefix}$targetExtractedDir"
 

build/scripts/build_haiku_package

@@ -61,12 +61,10 @@ mkindex=mkindex
 
 extractFile()
 {
-	# extractFile <archive> <directory> <extractedSubDir> <stripDebugSymbols>
+	# extractFile <archive> <directory> <extractedSubDir>
 	archiveFile=$1
 	targetExtractedDir=$2
 	extractedSubDir=$3
-	# Ignore stripDebugSymbols. It's not relevant here, since executables and
-	# libraries shouldn't come from zip files or other archives anymore.
 
 	extractDir=$tmpDir/extract
 	$rmAttrs -rf "$extractDir"