Revert "buildslaves: compress debugsymbols themselves and use faster …

…7z params for them" This reverts commit dfce544.
spring · Aug 28, 2012 · e35bb42 · e35bb42
1 parent d49b075
commit e35bb42
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
@@ -73,7 +73,7 @@ c['slaves'].append(BuildSlave("abma1",   passwords.abma1,   max_builds=1, proper
 c['slaves'].append(BuildSlave("koshi1",  passwords.koshi1,  max_builds=1, properties={'jobs': 2}))
 c['slaves'].append(BuildSlave("macosx1", passwords.macosx1, max_builds=1, properties={'jobs': 1}))
 c['slaves'].append(BuildSlave("zydox1",  passwords.zydox1,  max_builds=1, properties={'jobs': 2}))
-c['slaves'].append(BuildSlave("jk1",     passwords.jk1,     max_builds=1, properties={'jobs': 3}))
+c['slaves'].append(BuildSlave("jk1",     passwords.jk1,     max_builds=1, properties={'jobs': 2}))
 c['slavePortnum'] = 9989
 win_linux_slaves = ["koshi1"]
 

diff --git a/buildbot/slave/create_linux_static_bundle.sh b/buildbot/slave/create_linux_static_bundle.sh
@@ -11,7 +11,6 @@ echo "Installing into $DEST"
 
 #Ultra settings, max number of threads taken from commandline.
 SEVENZIP="nice -19 ionice -c3 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -mmt=${2:-on}"
-SEVENZIP_FAST="nice -19 ionice -c3 7z a -mx=0 -mmt=${2:-on}"
 ZIP="zip -r9"
 
 cd ${BUILDDIR}
@@ -29,7 +28,7 @@ for tostripfile in ${BINARIES}; do
 			if ! objdump -h ${tostripfile} | grep -q .gnu_debuglink; then
 				echo "stripping ${tostripfile}"
 				debugfile=${tostripfile%.*}.dbg
-				objcopy --only-keep-debug --compress-debug-sections ${tostripfile} ${debugfile}
+				objcopy --only-keep-debug ${tostripfile} ${debugfile}
 				strip --strip-debug --strip-unneeded ${tostripfile}
 				objcopy --add-gnu-debuglink=${debugfile} ${tostripfile}
 			else
@@ -69,7 +68,7 @@ for tocompress in ${BINARIES}; do
 			fi
 			debugfile=${tocompress%.*}.dbg
 			archive_debug="${TMP_PATH}/${VERSION}_${name}_${FILEPREFIX}_dbg.7z"
-			[ -f ${debugfile} ] && ${SEVENZIP_FAST} "${archive_debug}" ${debugfile} && rm ${debugfile}
+			[ -f ${debugfile} ] && ${SEVENZIP} "${archive_debug}" ${debugfile} && rm ${debugfile}
 		fi
 	fi
 done

diff --git a/buildbot/slave/make_installer.sh b/buildbot/slave/make_installer.sh
@@ -11,7 +11,6 @@ echo "Installing into $DEST"
 
 #Ultra settings, max number of threads taken from commandline.
 SEVENZIP="nice -19 ionice -c3 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -mmt=${2:-on}"
-SEVENZIP_FAST="nice -19 ionice -c3 7z a -mx=0 -mmt=${2:-on}"
 ZIP="zip -r9"
 
 MINGWLIBS_PATH=${1}
@@ -29,7 +28,7 @@ for tostripfile in ${EXECUTABLES}; do
 		if ! ${MINGW_HOST}objdump -h ${tostripfile} | grep -q .gnu_debuglink; then
 			echo "stripping ${tostripfile}"
 			debugfile=${tostripfile%.*}.dbg
-			${MINGW_HOST}objcopy --only-keep-debug --compress-debug-sections ${tostripfile} ${debugfile}
+			${MINGW_HOST}objcopy --only-keep-debug ${tostripfile} ${debugfile}
 			${MINGW_HOST}strip --strip-debug --strip-unneeded ${tostripfile}
 			${MINGW_HOST}objcopy --add-gnu-debuglink=${debugfile} ${tostripfile}
 		else
@@ -67,7 +66,7 @@ for tocompress in ${EXECUTABLES}; do
 	fi
 	debugfile=${tocompress%.*}.dbg
 	archive_debug="${TMP_PATH}/${VERSION}_${name}_dbg.7z"
-	[ ! -f ${debugfile} ] || ${SEVENZIP_FAST} "${archive_debug}" ${debugfile}
+	[ ! -f ${debugfile} ] || ${SEVENZIP} "${archive_debug}" ${debugfile}
 done
 
 cd ${SOURCEDIR}