diff --git a/build/jam/ImageRules b/build/jam/ImageRules index 91ca1e40aa..3ff1af87bd 100644 --- a/build/jam/ImageRules +++ b/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]) } diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage index 61c16ff888..db79ea0f0e 100644 --- a/build/jam/images/FloppyBootImage +++ b/build/jam/images/FloppyBootImage @@ -184,6 +184,7 @@ AddVariableToScript $(script) : addBuildCompatibilityLibDir : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; AddTargetVariableToScript $(script) : copyattr ; AddTargetVariableToScript $(script) : $(HAIKU_STRIP_$(TARGET_ARCH)) : strip ; +AddTargetVariableToScript $(script) : xres ; # create the other scripts local makeDirsScript = haiku-floppyboot-make-dirs ;