procps-ng: rename procps-ng to procps-ng3

Signed-off-by: krant <aleksey.vasilenko@gmail.com>

- Rebase patch because of packages version update was reverted before

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
krant
2024-02-15 13:05:43 +02:00
committed by Florian Eckert
parent bf700b6616
commit c1ef481e66
2 changed files with 16 additions and 15 deletions

View File

@@ -7,11 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=procps-ng PKG_NAME:=procps-ng3
PKG_VERSION:=3.3.16 PKG_VERSION:=3.3.16
PKG_RELEASE:=3 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/procps-ng-$(PKG_VERSION)
PKG_SOURCE:=procps-ng-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/procps-ng PKG_SOURCE_URL:=@SF/procps-ng
PKG_HASH:=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af PKG_HASH:=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af
@@ -45,7 +46,7 @@ PROCPS_APPLETS_DIR_BIN:=kill ps watch
PROCPS_APPLETS_DIR_SBIN:=sysctl 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)) 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-ng3/Default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libncurses DEPENDS:=+libncurses
@@ -58,12 +59,12 @@ define Build/Prepare
echo "$(PKG_VERSION)" > "$(PKG_BUILD_DIR)/.tarball-version" echo "$(PKG_VERSION)" > "$(PKG_BUILD_DIR)/.tarball-version"
endef endef
define Package/procps-ng define Package/procps-ng3
$(call Package/procps-ng/Default) $(call Package/procps-ng3/Default)
MENU:=1 MENU:=1
endef endef
define Package/procps-ng/description define Package/procps-ng3/description
procps is a set of command line and full-screen utilities that provide information out of the pseudo-filesystem procps is a set of command line and full-screen utilities that provide information out of the pseudo-filesystem
most commonly located at /proc. This filesystem provides a simple interface to the kernel data structures. most commonly located at /proc. This filesystem provides a simple interface to the kernel data structures.
The programs of procps generally concentrate on the structures that describe the processess running on the system. The programs of procps generally concentrate on the structures that describe the processess running on the system.
@@ -73,14 +74,14 @@ define Package/procps-ng/description
endef endef
define GenPlugin define GenPlugin
define Package/procps-ng-$(1) define Package/procps-ng3-$(1)
$(call Package/procps-ng/Default) $(call Package/procps-ng3/Default)
DEPENDS:=procps-ng DEPENDS:=procps-ng3
TITLE:=Applet $(1) from the procps-ng package TITLE:=Applet $(1) from the procps-ng3 package
ALTERNATIVES:=200:$(2)/$(1):/usr/libexec/$(1)-procps-ng ALTERNATIVES:=200:$(2)/$(1):/usr/libexec/$(1)-procps-ng
endef endef
define Package/procps-ng-$(1)/description define Package/procps-ng3-$(1)/description
Installs the applet $(1). Installs the applet $(1).
endef endef
endef endef
@@ -92,7 +93,7 @@ MAKE_FLAGS += \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
define Package/procps-ng/install define Package/procps-ng3/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/
endef endef
@@ -104,13 +105,13 @@ define Build/InstallDev
endef endef
define BuildPlugin define BuildPlugin
define Package/procps-ng-$(1)/install define Package/procps-ng3-$(1)/install
$(INSTALL_DIR) $$(1)/usr/libexec $(INSTALL_DIR) $$(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(2)/$(1) $$(1)/usr/libexec/$(1)-procps-ng $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(2)/$(1) $$(1)/usr/libexec/$(1)-procps-ng
endef endef
$$(eval $$(call BuildPackage,procps-ng-$(1))) $$(eval $$(call BuildPackage,procps-ng3-$(1)))
endef endef
$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,$(a),$(call procps-applets-src-dir,$(a))))) $(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,$(a),$(call procps-applets-src-dir,$(a)))))
$(eval $(call BuildPackage,procps-ng)) $(eval $(call BuildPackage,procps-ng3))