From 61529d3eb35c738fe61b62f11443a955af597cb0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 1 Apr 2024 07:17:09 +0200
Subject: avoid xz where possible

---
 scripts/prereq.sh | 12 ------------
 scripts/tarpkg    |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/scripts/prereq.sh b/scripts/prereq.sh
index d73ae73f2..717ddf15c 100755
--- a/scripts/prereq.sh
+++ b/scripts/prereq.sh
@@ -618,15 +618,6 @@ else
   host_build_cpio=1
 fi
 
-printf " --->  checking if xz is installed.. "
-host_build_xz=0
-if ! which xz >/dev/null 2>&1; then
-  printf "not found\n"
-  host_build_xz=1
-else
-  printf "found\n"
-fi
-
 # optional
 host_build_cdrtools=0
 if ! which mkisofs >/dev/null 2>&1; then
@@ -725,9 +716,6 @@ fi
 if [ $host_build_cpio -eq 1 ]; then
   printf "\t%s\n" "select ADK_HOST_BUILD_CPIO" >> $topdir/target/config/Config.in.prereq
 fi
-if [ $host_build_xz -eq 1 ]; then
-  printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq
-fi
 # optional
 if [ $host_build_cdrtools -eq 1 ]; then
   printf "\t%s\n" "select ADK_HOST_BUILD_CDRTOOLS if ADK_HOST_NEED_CDRTOOLS" >> $topdir/target/config/Config.in.prereq
diff --git a/scripts/tarpkg b/scripts/tarpkg
index 40ff94122..43a7ab4a1 100755
--- a/scripts/tarpkg
+++ b/scripts/tarpkg
@@ -16,14 +16,14 @@ if [ "$1" = "build" ];then
 		chmod +x ${2}/usr/lib/pkg/${pkgname}.$file )
 	done
 	rm -rf $2/CONTROL 
-	(cd $2 && tar -cf - .|xz -c > $3/${pkgname}_${version}_${arch}.tar.xz)
+	(cd $2 && tar -cf - .|gzip -c > $3/${pkgname}_${version}_${arch}.tar.gz)
 elif [ "$1" = "install" ];then
 	pkg=$(echo $(basename $2)|sed -e "s#_.*##")
 	if [ -x ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst ]; then
    	  IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst
 	  rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst
 	fi
-	xz -d -c $2|tar -xpf - -C ${PKG_INSTROOT}
+	gzip -d -c $2|tar -xpf - -C ${PKG_INSTROOT}
 	if [ -x ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst ]; then
    	  IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst
 	  rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst
-- 
cgit v1.2.3