LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #14257 from zhanhb/alternatives-libexec 

treewide: move binaries of alternatives to /usr/libexec
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
b2ba75c1c1 fc02216ab2
commit
c12f6762ef
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 38 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -6
      devel/diffutils/Makefile
  2. +3
    -3
      net/bridge-utils/Makefile
  3. +6
    -7
      net/openssh/Makefile
  4. +7
    -7
      net/wget/Makefile
  5. +6
    -6
      utils/coreutils/Makefile
  6. +5
    -5
      utils/findutils/Makefile
  7. +4
    -4
      utils/xz/Makefile

+ 6
- 6
devel/diffutils/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=diffutils PKG_NAME:=diffutils
PKG_VERSION:=3.7 PKG_VERSION:=3.7
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/diffutils PKG_SOURCE_URL:=@GNU/diffutils
@ -31,9 +31,8 @@ define Package/diffutils
TITLE:=diffutils TITLE:=diffutils
URL:=http://www.gnu.org/software/diffutils/ URL:=http://www.gnu.org/software/diffutils/
ALTERNATIVES:=\ ALTERNATIVES:=\
200:/usr/bin/cmp:/usr/bin/gnu-cmp \
200:/usr/bin/diff:/usr/bin/gnu-diff \
200:/usr/bin/cmp:/usr/libexec/cmp-gnu \
200:/usr/bin/diff:/usr/libexec/diff-gnu
endef endef
define Package/diffutils/description define Package/diffutils/description
@ -48,8 +47,9 @@ CONFIGURE_VARS += \
define Package/diffutils/install define Package/diffutils/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3} $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3} $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/bin/gnu-diff
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/bin/gnu-cmp
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/libexec/diff-gnu
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/libexec/cmp-gnu
endef endef
$(eval $(call BuildPackage,diffutils)) $(eval $(call BuildPackage,diffutils))

+ 3
- 3
net/bridge-utils/Makefile View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=bridge-utils PKG_NAME:=bridge-utils
PKG_VERSION:=1.7 PKG_VERSION:=1.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/shemminger/bridge-utils PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/shemminger/bridge-utils
@ -31,7 +31,7 @@ define Package/bridge
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=Ethernet bridging configuration utility TITLE:=Ethernet bridging configuration utility
URL:=http://www.linuxfromscratch.org/blfs/view/svn/basicnet/bridge-utils.html URL:=http://www.linuxfromscratch.org/blfs/view/svn/basicnet/bridge-utils.html
ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/bridge-utils-brctl
ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/brctl-bridge-utils
endef endef
define Package/bridge/description define Package/bridge/description
@ -44,7 +44,7 @@ CONFIGURE_ARGS += \
define Package/bridge/install define Package/bridge/install
$(INSTALL_DIR) $(1)/usr/libexec $(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/brctl $(1)/usr/libexec/bridge-utils-brctl
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/brctl $(1)/usr/libexec/brctl-bridge-utils
endef endef
$(eval $(call BuildPackage,bridge)) $(eval $(call BuildPackage,bridge))

+ 6
- 7
net/openssh/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=8.4p1 PKG_VERSION:=8.4p1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@ -49,9 +49,8 @@ define Package/openssh-client
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= client TITLE+= client
ALTERNATIVES:=\ ALTERNATIVES:=\
200:/usr/bin/ssh:/usr/bin/openssh-ssh \
200:/usr/bin/scp:/usr/bin/openssh-scp \
200:/usr/bin/ssh:/usr/libexec/ssh-openssh \
200:/usr/bin/scp:/usr/libexec/scp-openssh
endef endef
define Package/openssh-client/description define Package/openssh-client/description
@ -197,9 +196,9 @@ define Package/openssh-client/install
$(INSTALL_DIR) $(1)/etc/ssh $(INSTALL_DIR) $(1)/etc/ssh
chmod 0700 $(1)/etc/ssh chmod 0700 $(1)/etc/ssh
$(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/ $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/openssh-ssh
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/openssh-scp
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/libexec/ssh-openssh
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/libexec/scp-openssh
endef endef
define Package/openssh-client-utils/install define Package/openssh-client-utils/install


+ 7
- 7
net/wget/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wget PKG_NAME:=wget
PKG_VERSION:=1.20.3 PKG_VERSION:=1.20.3
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@ -47,7 +47,7 @@ $(call Package/wget/Default)
TITLE+= (with SSL support) TITLE+= (with SSL support)
VARIANT:=ssl VARIANT:=ssl
PROVIDES+=wget-ssl PROVIDES+=wget-ssl
ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-ssl
ALTERNATIVES:=300:/usr/bin/wget:/usr/libexec/wget-ssl
endef endef
define Package/wget/description define Package/wget/description
@ -60,7 +60,7 @@ $(call Package/wget/Default)
TITLE+= (without SSL support) TITLE+= (without SSL support)
VARIANT:=nossl VARIANT:=nossl
PROVIDES+=wget PROVIDES+=wget
ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-nossl
ALTERNATIVES:=300:/usr/bin/wget:/usr/libexec/wget-nossl
endef endef
define Package/wget-nossl/description define Package/wget-nossl/description
@ -95,13 +95,13 @@ ifeq ($(BUILD_VARIANT),nossl)
endif endif
define Package/wget/install define Package/wget/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/libexec/wget-ssl
endef endef
define Package/wget-nossl/install define Package/wget-nossl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/libexec/wget-nossl
endef endef
$(eval $(call BuildPackage,wget)) $(eval $(call BuildPackage,wget))


+ 6
- 6
utils/coreutils/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coreutils PKG_NAME:=coreutils
PKG_VERSION:=8.32 PKG_VERSION:=8.32
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/coreutils PKG_SOURCE_URL:=@GNU/coreutils
@ -56,9 +56,9 @@ DIR_OTHERS := \
base32 b2sum basenc csplit dir dircolors fmt join numfmt pathchk pinky \ base32 b2sum basenc csplit dir dircolors fmt join numfmt pathchk pinky \
pr ptx sha224sum sha384sum stdbuf tsort vdir 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_sort = +libpthread
DEPENDS_timeout = +librt DEPENDS_timeout = +librt
@ -137,8 +137,8 @@ endef
define BuildPlugin define BuildPlugin
define Package/$(1)/install 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)), $(foreach f,$(FILES_$(2)),
$(INSTALL_DIR) $$(1)/$(dir $(f)) $(INSTALL_DIR) $$(1)/$(dir $(f))
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/$(f) $$(1)/$(f) $(INSTALL_BIN) $(PKG_INSTALL_DIR)/$(f) $$(1)/$(f)


+ 5
- 5
utils/findutils/Makefile View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=findutils PKG_NAME:=findutils
PKG_VERSION:=4.7.0 PKG_VERSION:=4.7.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@ -49,13 +49,13 @@ endef
define Package/findutils-find define Package/findutils-find
$(call Package/findutils/Default) $(call Package/findutils/Default)
TITLE+= - find utility TITLE+= - find utility
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/findutils-find
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/find-findutils
endef endef
define Package/findutils-xargs define Package/findutils-xargs
$(call Package/findutils/Default) $(call Package/findutils/Default)
TITLE+= - xargs utility TITLE+= - xargs utility
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/findutils-xargs
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/xargs-findutils
endef endef
define Package/findutils-locate define Package/findutils-locate
@ -74,12 +74,12 @@ endef
define Package/findutils-find/install define Package/findutils-find/install
$(INSTALL_DIR) $(1)/usr/libexec $(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 endef
define Package/findutils-xargs/install define Package/findutils-xargs/install
$(INSTALL_DIR) $(1)/usr/libexec $(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 endef
define Package/findutils-locate/install define Package/findutils-locate/install


+ 4
- 4
utils/xz/Makefile View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz PKG_NAME:=xz
PKG_VERSION:=5.2.5 PKG_VERSION:=5.2.5
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/lzmautils PKG_SOURCE_URL:=@SF/lzmautils
@ -56,7 +56,7 @@ define BuildSubPackage
$(call Package/xz/Default) $(call Package/xz/Default)
DEPENDS:=xz-utils $(2) DEPENDS:=xz-utils $(2)
TITLE:=$(1) utility from XZ Utils 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 endef
define Package/$(1)/description define Package/$(1)/description
@ -64,8 +64,8 @@ define BuildSubPackage
endef endef
define Package/$(1)/install 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 endef
$$(eval $$(call BuildPackage,$(1))) $$(eval $$(call BuildPackage,$(1)))


Write Preview
Loading…
Cancel
Save