openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-15 19:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xz: use ALTERNATIVES instead of copying symlinks

Browse Source 
Installing the 'xz' package currently leads to file collisions:
Collected errors:
 * check_data_file_clashes: Package xz wants to install file /usr/bin/unxz
        But that file is already provided by package  * busybox
 * check_data_file_clashes: Package xz wants to install file /usr/bin/xz
        But that file is already provided by package  * busybox
 * opkg_install_cmd: Cannot install package debootstrap.

Fix that by switching to use ALTERNATIVES for all multicall commands
instead of copying the symlinks into the package.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2020-11-20 03:27:18 +00:00
parent 70e4e85788
commit bb704ffd4c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/xz/Makefile
View File

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.5
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/lzmautils
@@ -56,6 +56,7 @@ define BuildSubPackage
$(call Package/xz/Default)
DEPENDS:=xz-utils $(2)
TITLE:=$(1) utility from XZ Utils
$(if $(3),ALTERNATIVES:=$(foreach f,$(1) $(3),300:/usr/bin/$(f):/usr/bin/lzmautils-$(1)))
endef
define Package/$(1)/description
@@ -64,7 +65,7 @@ define BuildSubPackage
define Package/$(1)/install
$(INSTALL_DIR) $$(1)/usr/bin
$(CP) $(foreach f,$(1) $(3),$(PKG_INSTALL_DIR)/usr/bin/$(f)) $$(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/$(if $(3),lzmautils-$(1))
endef
$$(eval $$(call BuildPackage,$(1)))