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

---
 package/Config.in.options                          |  8 ++---
 package/xz/Makefile                                | 41 ----------------------
 package/xz/patches/patch-src_liblzma_liblzma_pc_in | 15 --------
 3 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 package/xz/Makefile
 delete mode 100644 package/xz/patches/patch-src_liblzma_liblzma_pc_in

(limited to 'package')

diff --git a/package/Config.in.options b/package/Config.in.options
index a806da895..cdf3f436a 100644
--- a/package/Config.in.options
+++ b/package/Config.in.options
@@ -2,14 +2,14 @@ config ADK_PACKAGE_SUFFIX
 	string
 	default "ipk" if ADK_TARGET_PACKAGE_IPKG
 	default "ipk" if ADK_TARGET_PACKAGE_OPKG
-	default "tar.xz" if ADK_TARGET_PACKAGE_TXZ
+	default "tar.gz" if ADK_TARGET_PACKAGE_TGZ
 
 choice
 prompt "Package format"
-default ADK_TARGET_PACKAGE_TXZ
+default ADK_TARGET_PACKAGE_TGZ
 
-config ADK_TARGET_PACKAGE_TXZ
-	bool "xz compressed tar archive"
+config ADK_TARGET_PACKAGE_TGZ
+	bool "gzip compressed tar archive"
 	help
 	  Create compressed tar archives of packages.
 	  Pre- and post install scripts will be executed in the target
diff --git a/package/xz/Makefile b/package/xz/Makefile
deleted file mode 100644
index 4a58f0047..000000000
--- a/package/xz/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		xz
-PKG_VERSION:=		5.4.6
-PKG_RELEASE:=		1
-PKG_HASH:=		913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49
-PKG_DESCR:=		compression utility
-PKG_SECTION:=		app/archive
-PKG_DEPENDS:=		libxz
-PKG_SITES:=		https://distfiles.openadk.org/
-PKG_LIBNAME:=		libxz
-PKG_OPTS:=		dev
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-PKG_SUBPKGS:=		XZ LIBXZ
-PKGSD_LIBXZ:=		xz compression library
-PKGSC_LIBXZ:=		libs/comp
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,LIBXZ,libxz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBXZ),$(PKGSD_LIBXZ),$(PKGSC_LIBXZ),$(PKG_OPTS)))
-
-HOST_CONFIGURE_ARGS+=	--disable-shared
-
-xz-install:
-	$(INSTALL_DIR) $(IDIR_XZ)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* $(IDIR_XZ)/usr/bin
-
-libxz-install:
-	$(INSTALL_DIR) $(IDIR_LIBXZ)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/liblzma.so* $(IDIR_LIBXZ)/usr/lib
-
-include $(ADK_TOPDIR)/mk/host-bottom.mk
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/xz/patches/patch-src_liblzma_liblzma_pc_in b/package/xz/patches/patch-src_liblzma_liblzma_pc_in
deleted file mode 100644
index 9481466af..000000000
--- a/package/xz/patches/patch-src_liblzma_liblzma_pc_in
+++ /dev/null
@@ -1,15 +0,0 @@
---- xz-5.2.2.orig/src/liblzma/liblzma.pc.in	2015-09-29 12:57:36.000000000 +0200
-+++ xz-5.2.2/src/liblzma/liblzma.pc.in	2016-11-23 16:04:15.407184892 +0100
-@@ -6,9 +6,9 @@
- #
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: liblzma
- Description: General purpose data compression library
-- 
cgit v1.2.3