[haiku-commits] r41812 - in haiku/trunk/build: jam scripts
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 29 May 2011 20:02:21 +0200 (CEST)
Author: mmadia
Date: 2011-05-29 20:02:21 +0200 (Sun, 29 May 2011)
New Revision: 41812
Changeset: https://dev.haiku-os.org/changeset/41812
Modified:
haiku/trunk/build/jam/HaikuCD
haiku/trunk/build/jam/HaikuImage
haiku/trunk/build/jam/ReleaseBuildProfiles
haiku/trunk/build/jam/UserBuildConfig.ReadMe
haiku/trunk/build/scripts/build_haiku_image
Log:
Applied a patch by Ingo, to strip the debug info from optional packages.
To note, the reduction of block size from 2048 to 1024 was not applied.
Introduced a new build variable HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES,
which will allow users to enable/disable that functionality. In the
alpha-* and nightly-* profiles, it is enabled. Reduced the image size
for alpha-* to 690M. The size for nightly images was left untouched.
+alpha3
Modified: haiku/trunk/build/jam/HaikuCD
===================================================================
--- haiku/trunk/build/jam/HaikuCD 2011-05-29 18:00:09 UTC (rev 41811)
+++ haiku/trunk/build/jam/HaikuCD 2011-05-29 18:02:21 UTC (rev 41812)
@@ -28,6 +28,8 @@
AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
+AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
+ : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
AddTargetVariableToScript $(script) : <build>addattr ;
AddTargetVariableToScript $(script) : <build>copyattr ;
AddTargetVariableToScript $(script) : <build>rc ;
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2011-05-29 18:00:09 UTC (rev 41811)
+++ haiku/trunk/build/jam/HaikuImage 2011-05-29 18:02:21 UTC (rev 41812)
@@ -153,7 +153,7 @@
PS\ Compatible
Preview
;
-SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR
+SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR
# Parallel\ Port
Print\ To\ File Serial\ Port USB\ Port
;
@@ -783,6 +783,8 @@
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
+AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
+ : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
AddTargetVariableToScript $(script) : <build>addattr ;
AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand
;
Modified: haiku/trunk/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/trunk/build/jam/ReleaseBuildProfiles 2011-05-29 18:00:09 UTC (rev
41811)
+++ haiku/trunk/build/jam/ReleaseBuildProfiles 2011-05-29 18:02:21 UTC (rev
41812)
@@ -16,7 +16,8 @@
HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
AddGroupToHaikuImage party : 101 : user sshd ;
HAIKU_IMAGE_HOST_NAME = shredder ;
- HAIKU_IMAGE_SIZE = 790 ;
+ HAIKU_IMAGE_SIZE = 690 ;
+ HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates
WQY-MicroHei ;
@@ -38,6 +39,7 @@
AddGroupToHaikuImage party : 101 : user sshd ;
HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 500 ;
+ HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ;
AddOptionalHaikuImagePackages Development Subversion OpenSSH
OpenSSL ;
Modified: haiku/trunk/build/jam/UserBuildConfig.ReadMe
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.ReadMe 2011-05-29 18:00:09 UTC
(rev 41811)
+++ haiku/trunk/build/jam/UserBuildConfig.ReadMe 2011-05-29 18:02:21 UTC
(rev 41812)
@@ -62,6 +62,9 @@
HAIKU_IMAGE_DIR = /tmp ;
HAIKU_IMAGE_SIZE = 100 ;
+# Enable stripping the debug symbols from optional packages.
+HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
+
# Set image volume label to "Walter". Default label is "Haiku".
HAIKU_IMAGE_LABEL = Walter ;
Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image 2011-05-29 18:00:09 UTC (rev
41811)
+++ haiku/trunk/build/scripts/build_haiku_image 2011-05-29 18:02:21 UTC (rev
41812)
@@ -16,6 +16,7 @@
# dontClearImage
# isVMwareImage
# optionalPackageDescriptions
+# stripOptionalPackageDebugSymbols
#
# addattr
# copyattr
@@ -141,6 +142,20 @@
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"
+ strip --strip-debug "$file"
+ fi
+}
+
extractFile()
{
# extractFile <archive> <directory>
@@ -173,6 +188,24 @@
rm $extractDir/.OptionalPackageDescription
fi
+ if [ "$stripOptionalPackageDebugSymbols" == "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"
$rmAttrs -rf "$extractDir"
Other related posts:
