Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13790 from zhanhb/procps-ng-alternatives

Browse source 
procps-ng: update alternatives
This commit is contained in:
Rosen Penev 2020-11-10 22:44:26 -08:00 committed by GitHub
commit 805f930a6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
utils/procps-ng/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=procps-ng PKG_NAME:=procps-ng
PKG_VERSION:=3.3.16 PKG_VERSION:=3.3.16
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/procps-ng PKG_SOURCE_URL:=@SF/procps-ng
@ -30,15 +30,19 @@ CONFIGURE_ARGS += --enable-skill
# most of these have alternatives provided by busybox applets # most of these have alternatives provided by busybox applets
PROCPS_APPLETS := \ PROCPS_APPLETS := \
free kill pgrep pkill pmap ps pwdx skill slabtop \ free kill pgrep pkill pmap ps pwdx skill slabtop \
snice tload top uptime vmstat w watch snice sysctl tload top uptime vmstat w watch
# procps-ng will be configured with "--bindir=/usr/bin --sbindir=/usr/sbin" and # procps-ng will be configured with "--bindir=/usr/bin --sbindir=/usr/sbin" and
# as such executables will be installed there by default, but some of them need # as such executables will be installed there by default, but some of them need
# to reside in locations such as /bin and /sbin to be in accordance with # to reside in locations such as /bin and /sbin to be in accordance with
# busybox alternatives which is also other distributions like debian and centos # busybox alternatives which is also other distributions like debian and centos
# are doing # are doing
PROCPS_APPLETS_DIR_bin:=kill ps watch PROCPS_APPLETS_SRC_DIR_SBIN:=sysctl
procps-applets-dir=$(if $(findstring $(1),$(PROCPS_APPLETS_DIR_bin)),/bin,/usr/bin) procps-applets-src-dir=$(if $(filter $(PROCPS_APPLETS_SRC_DIR_SBIN),$(1)),/usr/sbin,/usr/bin)
PROCPS_APPLETS_DIR_BIN:=kill ps watch
PROCPS_APPLETS_DIR_SBIN:=sysctl
procps-applets-dir=$(if $(filter $(PROCPS_APPLETS_DIR_BIN),$(1)),/bin,$(if $(filter $(PROCPS_APPLETS_DIR_SBIN),$(1)),/sbin,/usr/bin))
define Package/procps-ng/Default define Package/procps-ng/Default
SECTION:=utils SECTION:=utils
@ -68,20 +72,19 @@ define Package/procps-ng/description
endef endef
define GenPlugin define GenPlugin
define Package/$(1) define Package/procps-ng-$(1)
$(call Package/procps-ng/Default) $(call Package/procps-ng/Default)
DEPENDS:=procps-ng DEPENDS:=procps-ng
TITLE:=Applet $(2) from the procps-ng package TITLE:=Applet $(1) from the procps-ng package
ALTERNATIVES:=200:$(3)/$(2):$(3)/$(1) ALTERNATIVES:=200:$(2)/$(1):/usr/libexec/$(1)-procps-ng
endef endef
define Package/$(1)/description define Package/procps-ng-$(1)/description
Installs the applet $(2). Installs the applet $(1).
endef endef
endef endef
$(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,procps-ng-$(a),$(a),$(call procps-applets-dir,$(a))))) $(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,$(a),$(call procps-applets-dir,$(a)))))
$(eval $(call GenPlugin,procps-ng-sysctl,sysctl,/usr/sbin))
MAKE_FLAGS += \ MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
@ -93,20 +96,14 @@ define Package/procps-ng/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/
endef endef
define Package/procps-ng-sysctl/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sysctl $(1)/usr/sbin
endef
define BuildPlugin define BuildPlugin
define Package/$(1)/install define Package/procps-ng-$(1)/install
$(INSTALL_DIR) $$(1)$(3) $(INSTALL_DIR) $$(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)$(3)/$(1) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(2)/$(1) $$(1)/usr/libexec/$(1)-procps-ng
endef endef
$$(eval $$(call BuildPackage,$(1))) $$(eval $$(call BuildPackage,procps-ng-$(1)))
endef endef
$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,procps-ng-$(a),$(a),$(call procps-applets-dir,$(a))))) $(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,$(a),$(call procps-applets-src-dir,$(a)))))
$(eval $(call BuildPackage,procps-ng-sysctl))
$(eval $(call BuildPackage,procps-ng)) $(eval $(call BuildPackage,procps-ng))