Preserve resources and attributes when copying stripped binaries

When asked to strip binaries when copying to containers we now
strip to a temporary file, copy over resources to it, copy it
to the container, then copy the attributes from the original
source.

This should allow stripping binaries while preserving attributes
and resources even when copying to images.

build/jam/ImageRules

@@ -800,11 +800,17 @@ actions AppendToContainerCopyFilesScriptStripFile
 			>> $(2[1])
 	fi
 
-	echo \$cp "\"\${sPrefix}$(2[2])\"" \
+	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])\"" \
 		"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
 
-	echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" \
-		"2>/dev/null" "|| true" >> $(2[1])
+	echo \$rm "\"\${stripped_file}\"" >> $(2[1])
 }
 
 

build/jam/images/FloppyBootImage

@@ -184,6 +184,7 @@ 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 ;