cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14257 from zhanhb/alternatives-libexec

Browse Source 
treewide: move binaries of alternatives to /usr/libexec
This commit is contained in:
Rosen Penev
2020-12-17 21:41:04 -08:00
committed by GitHub
parent b2ba75c1c1 fc02216ab2
commit c12f6762ef
7 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/coreutils/Makefile
+6 -6
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coreutils
PKG_VERSION:=8.32
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/coreutils
@@ -56,9 +56,9 @@ DIR_OTHERS := \
base32 b2sum basenc csplit dir dircolors fmt join numfmt pathchk pinky \
pr ptx sha224sum sha384sum stdbuf tsort vdir
$(eval $(foreach a,$(DIR_BIN),ALTS_$(a):=300:/bin/$(a):/usr/bin/gnu-$(a)$(newline)))
$(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/bin/gnu-$(a)$(newline)))
$(eval $(foreach a,$(DIR_USR_SBIN),ALTS_$(a):=300:/usr/sbin/$(a):/usr/bin/gnu-$(a)$(newline)))
$(eval $(foreach a,$(DIR_BIN),ALTS_$(a):=300:/bin/$(a):/usr/libexec/$(a)-coreutils$(newline)))
$(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/libexec/$(a)-coreutils$(newline)))
$(eval $(foreach a,$(DIR_USR_SBIN),ALTS_$(a):=300:/usr/sbin/$(a):/usr/libexec/$(a)-coreutils$(newline)))
DEPENDS_sort = +libpthread
DEPENDS_timeout = +librt
@@ -137,8 +137,8 @@ endef
define BuildPlugin
define Package/$(1)/install
$(INSTALL_DIR) $$(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)/usr/bin/$(if $(ALTS_$(2)),gnu-$(2),$(2))
$(INSTALL_DIR) $$(1)/usr/$(if $(ALTS_$(2)),libexec,bin)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)/usr/$(if $(ALTS_$(2)),libexec/$(2)-coreutils,bin/$(2))
$(foreach f,$(FILES_$(2)),
$(INSTALL_DIR) $$(1)/$(dir $(f))
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/$(f) $$(1)/$(f)
utils/findutils/Makefile
+5 -5
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=findutils
PKG_VERSION:=4.7.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -49,13 +49,13 @@ endef
define Package/findutils-find
$(call Package/findutils/Default)
TITLE+= - find utility
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/findutils-find
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/find-findutils
endef
define Package/findutils-xargs
$(call Package/findutils/Default)
TITLE+= - xargs utility
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/findutils-xargs
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/xargs-findutils
endef
define Package/findutils-locate
@@ -74,12 +74,12 @@ endef
define Package/findutils-find/install
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/libexec/findutils-find
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/libexec/find-findutils
endef
define Package/findutils-xargs/install
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/libexec/findutils-xargs
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/libexec/xargs-findutils
endef
define Package/findutils-locate/install
utils/xz/Makefile
+4 -4
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.5
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/lzmautils
@@ -56,7 +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)))
$(if $(3),ALTERNATIVES:=$(foreach f,$(1) $(3),300:/usr/bin/$(f):/usr/libexec/$(1)-lzmautils))
endef
define Package/$(1)/description
@@ -64,8 +64,8 @@ define BuildSubPackage
endef
define Package/$(1)/install
$(INSTALL_DIR) $$(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/$(if $(3),lzmautils-$(1))
$(INSTALL_DIR) $$(1)$(if $(3),/usr/libexec,/usr/bin)
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)$(if $(3),/usr/libexec/$(1)-lzmautils,/usr/bin/$(1))
endef
$$(eval $$(call BuildPackage,$(1)))