Follow gitlab upx changes

- remove upx compression functions
gorgone · Jul 21, 2024 · 7924402 · 7924402
1 parent 0c00962
commit 7924402
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 105 deletions.
diff --git a/s3 b/s3
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SIMPLEVERSION="2024.05"
+SIMPLEVERSION="2024.07"
 VERSIONCOUNTER="$(git rev-list --count HEAD 2>/dev/null || printf "$(echo "$SIMPLEVERSION" | sed -e 's/\(.\)/\1\+0/g' | bc)_non-git")"
 DEVELOPER="Gorgone, WXbet"
 OIFS=$IFS
@@ -11,11 +11,8 @@ realdir=$(readlink -f $0)
 cd "$(dirname $realdir)"
 
 #set dir_vars
-workdir="$(pwd)"
- bindir="$sdir/upx"
-   PATH="$bindir:$PATH"
-   sdir="$workdir/support"
-
+  workdir="$(pwd)"
+     sdir="$workdir/support"
     osdir="$sdir/os"
      ldir="$sdir/logs"
      adir="$sdir/archive"
@@ -34,7 +31,7 @@ configdir="$sdir/configs"
 
 # create folders
 mkdir -p "$tcdir/native/bin" 2>/dev/null
-mkdir -p $sdir/{archive,binaries,downloads,software,logs,patches,backup_repo,menu_save,upx} 2>/dev/null
+mkdir -p $sdir/{archive,binaries,downloads,software,logs,patches,backup_repo,menu_save} 2>/dev/null
 [ -f $sdir/patches/no.patch ] && rm -f $sdir/patches/no.patch 2>/dev/null
 
 # some migrations of deprecated directories
@@ -81,7 +78,6 @@ USE_vars[USE_PATCH]=;
 USE_vars[USE_STAPI]=;
 USE_vars[USE_STAPI5]=;
 USE_vars[USE_CONFDIR]=;
-USE_vars[USE_COMPRESS]=;
 USE_vars[USE_EXTRA]=;
 USE_vars[USE_STATIC]=;
 USE_vars[STATIC_LIBCRYPTO]=;
@@ -95,7 +91,6 @@ s3cfg_vars[USE_TARGZ]=0
 s3cfg_vars[DIRECTMENU]=0
 s3cfg_vars[NO_REPO_AUTOUPDATE]=0
 s3cfg_vars[USE_VERBOSE]=0
-s3cfg_vars[USE_COMPRESS]=0
 s3cfg_vars[S3_UPDATE_CHECK]=1
 s3cfg_vars[S3_URL_CHECK]=1
 s3cfg_vars[INSTALL_NATIVE_LIBDVBCSA]=1
@@ -113,7 +108,6 @@ s3opts=( cedit checkout clean disable_emu enable_emu fix_me get_patch help lang_
 
 CUSTOM_CONFDIR="not_set"
 pf_name="not_set"
-UPX="not_set"
 
 #internal vars
 OPENBOX=0
@@ -386,17 +380,6 @@ else
 				fi
 			fi
 
-			if [ "${2:0:5}" == "-upx=" ] || [ "${2:0:5}" == "-UPX=" ]
-			then
-				UPX=${2#*=};USE_vars[USE_COMPRESS]="USE_COMPRESS=1"
-			fi
-
-			if [ "${3:0:5}" == "-upx=" ] || [ "${3:0:5}" == "-UPX=" ]
-			then
-				UPX=${2#*=}
-				USE_vars[USE_COMPRESS]="USE_COMPRESS=1"
-			fi
-
 			[ "$pf" == "empty" ] && c_m_d="$*" || c_m_d="all_off $pf $*"; # set only active module with profiles
 			for cmd in $c_m_d
 			do
@@ -411,12 +394,6 @@ else
 					USE_vars[USE_OSCAMNAME]="USE_OSCAMNAME=${cmd#*=}"
 				fi
 
-				if [ "${cmd:0:5}" == "-upx=" ] || [ "${cmd:0:5}" == "-UPX=" ]
-				then
-					UPX="${cmd#*=}"
-					USE_vars[USE_COMPRESS]="USE_COMPRESS=1"
-				fi
-
 				for cc in "${config_cases[@]}"
 				do
 					[ "$cmd" == "$cc$on" ]  && all_cc+=($cc$on) && break

diff --git a/support/configs/simplebuild.config b/support/configs/simplebuild.config
@@ -6,6 +6,5 @@ S3_URL_CHECK=1
 INSTALL_NATIVE_LIBDVBCSA=1
 PATCH_WEBIF=1
 USE_VERBOSE=0
-USE_COMPRESS=0
 USE_TARGZ=0
 delete_oscamdebugbinary=1
diff --git a/support/functions/_cmd_build b/support/functions/_cmd_build
@@ -139,8 +139,6 @@ _cmd_build(){
 					_dvbcsa="-libdvbcsa";;	# set libdvbcsa suffix to name
 			"USE_TARGZ=1")
 					s3cfg_vars[TARGZ]=1;;	# overwrite global
-			"USE_COMPRESS=1")
-					s3cfg_vars[COMPRESS]=1;;# overwrite global
 			"USE_STATIC=1")
 					_make="make static";;
 			"USE_STAPI=1")
@@ -181,7 +179,7 @@ printf "$y_l\n |       set : ${cdtag}$w_l"
 #if build with profile
 	[ ! "$pf" == "empty" ] && printf "\n$y_l |   PROFILE : $pf_name"
 
-#IF SVN is Patched
+#IF REPO is Patched
 	if [ -f "$workdir/${REPO^^}-IS-PATCHED" ]
 	then
 		printf "$y_l\n | ISPATCHED :$P YES (integrate patch infomation into WebIf)"
@@ -201,10 +199,10 @@ printf "$y_l\n |       set : ${cdtag}$w_l"
 #dynamic, static, mixed build
 	[ "$_toolchainname" == "native" ] && SEARCHDIR="$(ldconfig -v 2>/dev/null | grep -v ^$'\t' | awk -F':' '{print $1}')" || SEARCHDIR="$SYSROOT"
 	[ "${USE_vars[USE_LIBCRYPTO]}" == "USE_LIBCRYPTO=1" ] && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_LIBCRYPTO]}" == "STATIC_LIBCRYPTO=1" ]	&& LIBCRYPTO_STATIC="LIBCRYPTO_LIB=$(find $SEARCHDIR -name "libcrypto.a" -type f -print -quit)"	&& ((statcount++))
-	[ "${USE_vars[USE_SSL]}" == "USE_SSL=1" ]             && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_SSL]}" == "STATIC_SSL=1" ]				&& SSL_STATIC="SSL_LIB=$(find $SEARCHDIR -name "libssl.a" -type f -print -quit)"					&& ((statcount++))
+	[ "${USE_vars[USE_SSL]}" == "USE_SSL=1" ]             && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_SSL]}" == "STATIC_SSL=1" ]				&& SSL_STATIC="SSL_LIB=$(find $SEARCHDIR -name "libssl.a" -type f -print -quit)"				&& ((statcount++))
 	[ "${USE_vars[USE_LIBUSB]}" == "USE_LIBUSB=1" ]       && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_LIBUSB]}" == "STATIC_LIBUSB=1" ]		&& LIBUSB_STATIC="LIBUSB_LIB=$(find $SEARCHDIR -name "libusb-1.0.a" -type f -print -quit)"		&& ((statcount++))
 	[ "${USE_vars[USE_PCSC]}" == "USE_PCSC=1" ]           && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_PCSC]}" == "STATIC_PCSC=1" ]			&& PCSC_STATIC="PCSC_LIB=$(find $SEARCHDIR -name "libpcsclite.a" -type f -print -quit)"			&& ((statcount++))
-	[ "${USE_vars[USE_LIBDVBCSA]}" == "USE_LIBDVBCSA=1" ] && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_LIBDVBCSA]}" == "STATIC_LIBDVBCSA=1" ]	&& DVBCSA_STATIC="LIBDVBCSA_LIB=$(find $SEARCHDIR -name "libdvbcsa.a" -type f -print -quit)"		&& ((statcount++))
+	[ "${USE_vars[USE_LIBDVBCSA]}" == "USE_LIBDVBCSA=1" ] && [ "${USE_vars[USE_STATIC]}" == "USE_STATIC=1" -o "${USE_vars[STATIC_LIBDVBCSA]}" == "STATIC_LIBDVBCSA=1" ]	&& DVBCSA_STATIC="LIBDVBCSA_LIB=$(find $SEARCHDIR -name "libdvbcsa.a" -type f -print -quit)"	&& ((statcount++))
 
 	if [ $statcount -ge 1 -a $statcount -lt $libcount ]
 	then
@@ -239,6 +237,12 @@ then
 else
 	_generate_oscam_name "$_toolchainname"
 fi
+
+if [[ $oscam_name =~ -upx ]]
+then
+	[ -f "$configdir/upx_option" ] && source "$configdir/upx_option"
+	COMP_LEVEL="COMP_LEVEL=$upx_c"
+fi 
 	oscam_name="$oscam_name$extra$buildtype"
 	_nl
 	USESTRING=${USE_vars[@]}
@@ -252,11 +256,12 @@ fi
 	"EXTRA_LDFLAGS=$extra_ld" \
 	"EXTRA_CFLAGS=$extra_c" \
 	$EXTRA_USE \
+	$COMP_LEVEL \
 	"CROSS=$CROSS" $STAPI_LIB $USESTRING $LIBCRYPTO_STATIC $SSL_STATIC $LIBUSB_STATIC $PCSC_STATIC $DVBCSA_STATIC 2>&1 \
 	|tee -a "$ldir/$log_name" \
 	|grep --line-buffered -v 'BFD\|^/' \
-	|grep --line-buffered '^CC\|^HOSTCC\|^GEN\|^CONF\|^RM\|UseFlags\|  CONF_DIR =\|Binary\|LINK\|STRIP\|BUILD\|Addons\|Protocols\|Readers\|CardRdrs\|^/' \
-	|sed -e "s/^|/"$Y" |/g;s/^RM/"$R" REMOVE ----->$W/g;s/^CONF/"$C" CONFIG ----->$W/g;s/^LINK/"$P" LINK ------->$W/g;s/^STRIP/"$P" STRIP ------>$W/g;s/^CC\|^HOSTCC\|^BUILD/"$G" BUILD ------>$W/g;s/^GEN/"$C" GEN -------->/g;
+	|grep --line-buffered '^CC\|^HOSTCC\|^GEN\|^CONF\|^RM\|^.*\d*->\|UseFlags\|  CONF_DIR =\|Binary\|LINK\|STRIP\|BUILD\|Addons\|Protocols\|Readers\|CardRdrs\|^/' \
+	|sed -e "s/^|/"$Y" |/g;/^.*\d*->/ s/./"$C" UPX -------->$W&/;s/^RM/"$R" REMOVE ----->$W/g;s/^CONF/"$C" CONFIG ----->$W/g;s/^LINK/"$P" LINK ------->$W/g;s/^STRIP/"$P" STRIP ------>$W/g;s/^CC\|^HOSTCC\|^BUILD/"$G" BUILD ------>$W/g;s/^GEN/"$C" GEN -------->/g;
 	s/WEBIF_//g;s/WITH_//g;s/MODULE_//g;s/CS_//g;s/HAVE_//g;s/_CHARSETS//g;s/CW_CYCLE_CHECK/CWCC/g;s/SUPPORT//g;s/= /: /g;"
 
 #calc buildtime
@@ -294,13 +299,6 @@ fi
 #show build time
 	printf "$g_n""\n TIME -------> $bt$re_\n\n"
 
-#compress cam
-	if [ "${s3cfg_vars[COMPRESS]}" == "1" ]
-	then
-		printf "$w_l"" ENABLE -----> COMPRESSION:$y_l $txt_wait"
-		compress_cam "$oscam_name"
-	fi;
-
 	if [ "${s3cfg_vars[TARGZ]}" == "1" ]
 	then
 		printf "$w_l"" ENABLE -----> TARGZ:$y_l $txt_wait\n"
@@ -310,7 +308,7 @@ fi
 #link lastlog
 	ln -frs "$ldir/$log_name" "$workdir/lastbuild.log"
 	if [ "${USE_vars[USE_DIAG]}" == "USE_DIAG=1" ]; then
-		grep -v "^CC\|^GEN\|^CONF\|^RM\|^BUILD\|STRIP\|LINK\|^+\|^scan-build: R\|^scan-build: U\|HOSTCC\|^|" -i "$workdir/lastbuild.log" \
+		grep -v "^CC\|^GEN\|^CONF\|^RM\|^.*\d*->\|^BUILD\|STRIP\|LINK\|^+\|^scan-build: R\|^scan-build: U\|HOSTCC\|^|" -i "$workdir/lastbuild.log" \
 		|sed $'s/ generated./ generated.\\\n\\\n\\\n/g' >"$workdir/USE_DIAG.log"
 	fi
 

diff --git a/support/functions/_compress b/support/functions/_compress
@@ -1,39 +1,5 @@
 #!/bin/bash
 
-compress_cam(){
-	cd "$bdir"
-	upx_c="-1"
-
-	[ -f "$configdir/upx_option" ] && source "$configdir/upx_option"
-	[ "$UPX" == "not_set" ] || upx_c=$UPX
-
-	erg=$(upx "$upx_c" "$1" |grep oscam |awk '{print $1" "$3" "$4 }')
-	e1="$(echo "$erg"| awk '{printf("%4.2fk\n", $1 /1024)}')"
-	e2="$(echo "$erg"| awk '{printf("%4.2fk\n", $2 /1024)}')"
-	e3="$(echo "$erg"| awk '{print $3}') (level=$upx_c)"
-
-	echo -e "\n
-	$w_l\r BEFORE -----> $txt_compress1\t= $g_n$e1
-	$w_l\r AFTER ------> $txt_compress2\t= $g_l$e2
-	$w_l\r RESULT -----> $txt_compress3\t= $c_n$e3
-	$rs_"
-}
-
-compress_cam_gui(){
-	cd "$bdir"
-	upx_c="-1"
-
-	[ -f "$configdir/upx_option" ] && source "$configdir/upx_option"
-	[ "$UPX" == "not_set" ] || upx_c=$UPX
-
-	erg=$(upx "$upx_c" "$1" |grep oscam |awk '{print $1" "$3" "$4 }')
-	e1="$(echo "$erg"| awk '{printf("%4.2f k\n", $1 /1024)}')"
-	e2="$(echo "$erg"| awk '{printf("%4.2fk\n", $2 /1024)}')"
-	e3="$(echo "$erg"| awk '{print $3}')\n"
-
-	echo -en "\n$txt_compress1\t= $e1\n$txt_compress2\t= $e2\n$txt_compress3\t= $e3"
-}
-
 tar_cam_gui(){
 	cd "$bdir"
 	erg=$(tar zcf $1.tar.gz $1 $2)

diff --git a/support/functions/_gui_build b/support/functions/_gui_build
@@ -57,7 +57,7 @@ _gui_build(){
 	for e in $_us
 	do
 
-		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_COMPRESS" ] && [ ! "$e" == "USE_PATCH" ]  && [ ! "$e" == "USE_EXTRA" ] && [ ! "$e" == "USE_STATIC" ]
+		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_PATCH" ]  && [ ! "$e" == "USE_EXTRA" ] && [ ! "$e" == "USE_STATIC" ]
 		then
 			USESTRING_="$e=1 $USESTRING_"
 		fi
@@ -139,6 +139,12 @@ _gui_build(){
 	oscam_name="$oscam_name$extra$buildtype"
 	targztmp="$(mktemp)"
 
+	if [[ $oscam_name =~ -upx ]]
+	then
+		[ -f "$configdir/upx_option" ] && source "$configdir/upx_option"
+		COMP_LEVEL="COMP_LEVEL=$upx_c"
+	fi
+
 	if [ ! "${USE_vars[USE_TARGZ]}" == "USE_TARGZ=1" ]
 	then
 		s3cfg_vars[USE_TARGZ]=0
@@ -150,11 +156,11 @@ _gui_build(){
 	(ologo; _nl
 	timer_start
 	$_make -j"$cpus" \
-		"CONF_DIR=$_oscamconfdir_default" "OSCAM_BIN=$bdir/$oscam_name" "CC_OPTS=$co $cc_opts $extra_cc" "CC_WARN=$cc_warn" "EXTRA_LDFLAGS=$extra_ld" "EXTRA_CFLAGS=$extra_c" $EXTRA_USE "CROSS=$CROSS" $stapivar $USESTRING_ $LIBCRYPTO_STATIC $SSL_STATIC $LIBUSB_STATIC $PCSC_STATIC $DVBCSA_STATIC 2>&1 \
+		"CONF_DIR=$_oscamconfdir_default" "OSCAM_BIN=$bdir/$oscam_name" "CC_OPTS=$co $cc_opts $extra_cc" "CC_WARN=$cc_warn" "EXTRA_LDFLAGS=$extra_ld" "EXTRA_CFLAGS=$extra_c" $EXTRA_USE $COMP_LEVEL "CROSS=$CROSS" $stapivar $USESTRING_ $LIBCRYPTO_STATIC $SSL_STATIC $LIBUSB_STATIC $PCSC_STATIC $DVBCSA_STATIC 2>&1 \
 		|tee "$ldir/$log_name" \
 		|grep --line-buffered -v 'BFD\|^/' \
-		|grep --line-buffered '^CC\|^HOSTCC\|^GEN\|^CONF\|^RM\|UseFlags\|  CONF_DIR =\|Binary\|LINK\|STRIP\|BUILD\|Addons\|Protocols\|Readers\|CardRdrs\|^/' \
-		|sed -u "s/^|/ |/g;s/^RM/ |  REMOVE>/g;s/^CONF/ |  CONFIG>/g;s/^LINK/ |  LINK  >/g;s/^STRIP/ |  STRIP >/g;s/^CC\|^HOSTCC\|^BUILD/ |  BUILD >/g;s/^GEN/ |  GEN   >/g;s/WEBIF_//g;s/WITH_//g;s/MODULE_//g;s/CS_//g;s/HAVE_//g;s/_CHARSETS//g;s/CW_CYCLE_CHECK/CWCC/g;s/SUPPORT//g;s/= /: /g;"
+		|grep --line-buffered '^CC\|^HOSTCC\|^GEN\|^CONF\|^RM\|^.*\d*->\|UseFlags\|  CONF_DIR =\|Binary\|LINK\|STRIP\|BUILD\|Addons\|Protocols\|Readers\|CardRdrs\|^/' \
+		|sed -u "s/^|/ |/g;/^.*\d*->/ s/./ |    UPX >&/;s/^RM/ |  REMOVE>/g;s/^CONF/ |  CONFIG>/g;s/^LINK/ |  LINK  >/g;s/^STRIP/ |  STRIP >/g;s/^CC\|^HOSTCC\|^BUILD/ |  BUILD >/g;s/^GEN/ |  GEN   >/g;s/WEBIF_//g;s/WITH_//g;s/MODULE_//g;s/CS_//g;s/HAVE_//g;s/_CHARSETS//g;s/CW_CYCLE_CHECK/CWCC/g;s/SUPPORT//g;s/= /: /g;"
 	timer_stop
 	timer_calc
 
@@ -190,18 +196,6 @@ _gui_build(){
 	fi;) | "$gui" "$st_" --colors --title " -[ Build$(TTAG) ]- " "$pb_" "$_lines" "$_cols"
 	sleep 2
 
-#COMPRESS
-	if [ ! "$stapi_allowed" == "1" ]
-	then
-
-		if [ "${s3cfg_vars[COMPRESS]}" == "1" ] || [ "${USE_vars[USE_COMPRESS]}" == "USE_COMPRESS=1" ]
-		then
-			(compress_cam_gui "$oscam_name") |tee -a "$ldir/$log_name"| "$gui" "$st_" --title " -[ COMPRESS ]- " "$pb_" 7 50
-			sleep 2
-		fi
-
-	fi
-
 #tar
 	if [ "${USE_vars[USE_TARGZ]}" == "USE_TARGZ=1" ]
 	then

diff --git a/support/functions/_misc b/support/functions/_misc
@@ -305,7 +305,7 @@ _oscam_extra_menu(){
 
 	for e in "${!USE_vars[@]}"
 	do
-		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_COMPRESS" ] && [ ! "$e" == "USE_PATCH" ] && [ ! "$e" == "USE_LIBUSB" ] && [ ! "$e" == "USE_EXTRA" ] && \
+		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_PATCH" ] && [ ! "$e" == "USE_LIBUSB" ] && [ ! "$e" == "USE_EXTRA" ] && \
 		   [ ! "$e" == "USE_STATIC" ] && [ ! "$e" == "STATIC_LIBCRYPTO" ] && [ ! "$e" == "STATIC_SSL" ] && [ ! "$e" == "STATIC_LIBUSB" ] && [ ! "$e" == "STATIC_PCSC" ] && [ ! "$e" == "STATIC_LIBDVBCSA" ]
 		then
 			if [ "${#USE_vars[$e]}" -gt "4" ]
@@ -322,7 +322,7 @@ _oscam_extra_menu(){
 
 	for e in "${!USE_vars[@]}"
 	do
-		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_COMPRESS" ] && [ ! "$e" == "USE_PATCH" ] && [ ! "$e" == "USE_LIBUSB" ] && [ ! "$e" == "USE_EXTRA" ] && \
+		if [ ! "$e" == "USE_TARGZ" ] && [ ! "$e" == "USE_PATCH" ] && [ ! "$e" == "USE_LIBUSB" ] && [ ! "$e" == "USE_EXTRA" ] && \
 		   [ ! "$e" == "USE_STATIC" ] && [ ! "$e" == "STATIC_LIBCRYPTO" ] && [ ! "$e" == "STATIC_SSL" ] && [ ! "$e" == "STATIC_LIBUSB" ] && [ ! "$e" == "STATIC_PCSC" ] && [ ! "$e" == "STATIC_LIBDVBCSA" ]
 		then
 			ok=0
@@ -349,13 +349,12 @@ _build_extra_menu(){
 	us=
 	check_smargo
 	unset MENU_OPTIONS
-	for e in USE_COMPRESS USE_TARGZ USE_PATCH USE_EXTRA USE_STATIC STATIC_LIBCRYPTO STATIC_SSL STATIC_LIBUSB STATIC_PCSC STATIC_LIBDVBCSA
+	for e in USE_TARGZ USE_PATCH USE_EXTRA USE_STATIC STATIC_LIBCRYPTO STATIC_SSL STATIC_LIBUSB STATIC_PCSC STATIC_LIBDVBCSA
 	do
 		[ "${#USE_vars[$e]}" -gt "4" ] && MENU_OPTIONS+=( "$e" "$e=1" on ) || MENU_OPTIONS+=( "$e" "$e=1" off )
 	done
 	bextra=$("$gui" "$st_" "$nc_" "$bt_" "$title_" --title "-[ Build EXTRA$(TTAG) ]-" "$cl_" " OPTIONS " 17 45 3 ${MENU_OPTIONS[@]})
 	[ $? = 255 ] && _build_extra_menu
-	USE_vars[USE_COMPRESS]=
 	USE_vars[USE_PATCH]=
 	USE_vars[USE_TARGZ]=
 	USE_vars[USE_EXTRA]=
@@ -607,8 +606,8 @@ save_config(){
 	check_smargo
 	enabled=($("${repodir}/config.sh" -s))
 	disabled=($("${repodir}/config.sh" -Z))
-	[ "$_toolchainname" == "sh4" ] && unset USE_vars[USE_COMPRESS]
-	[ "$_toolchainname" == "sh_4" ] && unset USE_vars[USE_COMPRESS]
+	[ "$_toolchainname" == "sh4" ] && silent=$("${repodir}/config.sh" --disable WITH_COMPRESS)
+	[ "$_toolchainname" == "sh_4" ] && silent=$("${repodir}/config.sh" --disable WITH_COMPRESS)
 	unset USE_vars[USE_STAPI]
 	unset USE_vars[USE_STAPI5]
 
@@ -658,15 +657,14 @@ load_config(){
 	else
 		_reset_config
 		[ "${s3cfg_vars[USE_TARGZ]}" == "1" ] && USE_vars[USE_TARGZ]="USE_TARGZ=1"
-		[ "${s3cfg_vars[USE_COMPRESS]}" == "1" ] && USE_vars[USE_COMPRESS]="USE_COMPRESS=1"
 		for e in $default_use
 		do
 			USE_vars[$e]="$e=1"
 		done
 	fi
 	check_smargo
-	[ "$_toolchainname" == "sh4" ] && unset USE_vars[USE_COMPRESS]
-	[ "$_toolchainname" == "sh_4" ] && unset USE_vars[USE_COMPRESS]
+	[ "$_toolchainname" == "sh4" ] && silent=$("${repodir}/config.sh" --disable WITH_COMPRESS)
+	[ "$_toolchainname" == "sh_4" ] && silent=$("${repodir}/config.sh" --disable WITH_COMPRESS)
 	USESTRING="$(echo "${USE_vars[@]}"| sed 's@USE_@@g'| sed 's@=1@@g'| tr -s ' ')"
 }
 _get_config_con(){

diff --git a/support/functions/_sys_check b/support/functions/_sys_check
@@ -6,9 +6,6 @@ prerequisites(){
 	[[ $1 ]] && output=": &&" || output="printf";
 	$output "$w_l  CHECK for binaries\n  ==================\n";
 
-# check for a forgotten and unusable 'upx' and remove this crap
-	[ -x "$bindir"/upx ] && "$bindir"/upx -V &>/dev/null || rm -f "$bindir"/upx &>/dev/null;
-
 	for e in "${binvars[@]}"
 	do
 		if [ "$e" == "autoconf-archive" ]