i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Allow stripping binaries when copying to image containers"

Browse Source 
This reverts commit d6de84de66.
This commit is contained in:
Ingo Weinhold
2013-10-12 16:01:02 +02:00
parent 7879928fb2
commit 19f94028f6
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
-2
View File
@@ -46,8 +46,6 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
= HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ; = HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ;
HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
= system ; = system ;
#HAIKU_CONTAINER_STRIP_BINARIES on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
# = 1 ;
# boot CD image # boot CD image
HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-cd-container ; HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-cd-container ;
build/jam/ImageRules
-14
View File
@@ -692,8 +692,6 @@ rule CreateContainerCopyFilesScript container : script
local dummyTarget = $(script)-dummy-$(dir:G=)-$(target) ; local dummyTarget = $(script)-dummy-$(dir:G=)-$(target) ;
NotFile $(dummyTarget) ; NotFile $(dummyTarget) ;
TARGET_DIR on $(dummyTarget) = $(dir:G=) ; TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
DO_STRIP on $(dummyTarget) = [ on $(container)
return $(HAIKU_CONTAINER_STRIP_BINARIES) ] ;
local nameFunction local nameFunction
= [ on $(destTarget) return $(NAME_FUNCTION) ] ; = [ on $(destTarget) return $(NAME_FUNCTION) ] ;
@@ -723,8 +721,6 @@ rule CreateContainerCopyFilesScript container : script
local dummyTarget = $(script)-dummy-$(dir:G=) ; local dummyTarget = $(script)-dummy-$(dir:G=) ;
NotFile $(dummyTarget) ; NotFile $(dummyTarget) ;
TARGET_DIR on $(dummyTarget) = $(dir:G=) ; TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
DO_STRIP on $(dummyTarget) = [ on $(container)
return $(HAIKU_CONTAINER_STRIP_BINARIES) ] ;
Depends $(dummyTarget) : $(initScript) $(targets) Depends $(dummyTarget) : $(initScript) $(targets)
$(serializationDependency) ; $(serializationDependency) ;
@@ -767,11 +763,6 @@ actions piecemeal AppendToContainerCopyFilesScript bind OUTPUT_SCRIPT
{ {
echo \$cp "\"\${sPrefix}$(2)\"" "\"\${tPrefix}$(TARGET_DIR)\"" \ echo \$cp "\"\${sPrefix}$(2)\"" "\"\${tPrefix}$(TARGET_DIR)\"" \
>> $(OUTPUT_SCRIPT) >> $(OUTPUT_SCRIPT)
if [ -n "$(DO_STRIP:E)" ]; then
echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(2:BS)\"" "2>/dev/null" \
"|| true" >> $(OUTPUT_SCRIPT)
fi
} }
@@ -784,11 +775,6 @@ actions AppendToContainerCopyFilesScriptSingleFile
echo \$cp "\"\${sPrefix}$(2[2])\"" \ echo \$cp "\"\${sPrefix}$(2[2])\"" \
"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1]) "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
if [ -n "$(DO_STRIP:E)" ]; then
echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" \
"2>/dev/null" "|| true" >> $(2[1])
fi
} }
build/jam/images/FloppyBootImage
-1
View File
@@ -183,7 +183,6 @@ AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
AddTargetVariableToScript $(script) : <build>copyattr ; AddTargetVariableToScript $(script) : <build>copyattr ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP_$(TARGET_ARCH)) : strip ;
# create the other scripts # create the other scripts
local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ; local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ;