From d05822f18b93c2de6b904304ecd9dea7047870b6 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 12 Oct 2013 15:59:19 +0200
Subject: [PATCH] Revert "Preserve resources and attributes when copying
 stripped binaries"

This reverts commit a427aa2f4a47ae242110e9d98d4bed307f8dad73.
---
 build/jam/ImageRules             | 12 +++---------
 build/jam/images/FloppyBootImage |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 3ff1af87bd..91ca1e40aa 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -800,17 +800,11 @@ actions AppendToContainerCopyFilesScriptStripFile
 			>> $(2[1])
 	fi
 
-	echo "stripped_file=\"\${tmpDir}/stripped_\$\$\"" >> $(2[1])
-
-	echo \$strip -o "\"\${stripped_file}\"" "\"\${sPrefix}$(2[2])\"" >> $(2[1])
-	echo \$xres -o "\"\${stripped_file}\"" "\"\${sPrefix}$(2[2])\"" >> $(2[1])
-
-	echo \$cp "\"\${stripped_file}\"" \
-		"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
-	echo \$copyattr "\"\${sPrefix}$(2[2])\"" \
+	echo \$cp "\"\${sPrefix}$(2[2])\"" \
 		"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
 
-	echo \$rm "\"\${stripped_file}\"" >> $(2[1])
+	echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" \
+		"2>/dev/null" "|| true" >> $(2[1])
 }
 
 
diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage
index db79ea0f0e..61c16ff888 100644
--- a/build/jam/images/FloppyBootImage
+++ b/build/jam/images/FloppyBootImage
@@ -184,7 +184,6 @@ AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
 AddTargetVariableToScript $(script) : <build>copyattr ;
 AddTargetVariableToScript $(script) : $(HAIKU_STRIP_$(TARGET_ARCH)) : strip ;
-AddTargetVariableToScript $(script) : <build>xres ;
 
 # create the other scripts
 local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ;