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

Merge pull request #15445 from turris-cz/psmisc-killall-alternatives

Browse source 
psmisc: move killall to /usr/libexec and add ALTERNATIVES
This commit is contained in:
Josef Schlehofer 2021-04-18 19:50:38 +02:00 committed by GitHub
commit b477c0a704
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/psmisc/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=psmisc PKG_NAME:=psmisc
PKG_VERSION:=23.4 PKG_VERSION:=23.4
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:=@SF/psmisc PKG_SOURCE_URL:=@SF/psmisc
@ -23,6 +23,7 @@ define Package/psmisc
TITLE:=proc utilities TITLE:=proc utilities
URL:=https://gitlab.com/psmisc/psmisc/ URL:=https://gitlab.com/psmisc/psmisc/
DEPENDS:=+libncurses DEPENDS:=+libncurses
ALTERNATIVES:=300:/usr/bin/killall:/usr/libexec/killall
endef endef
define Package/psmisc/description define Package/psmisc/description
@ -38,16 +39,11 @@ MAKE_FLAGS += \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
define Package/psmisc/preinst
#!/bin/sh
if [ -e $${IPKG_INSTROOT}/usr/bin/killall ]; then
rm $${IPKG_INSTROOT}/usr/bin/killall;
fi
endef
define Package/psmisc/install define Package/psmisc/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{fuser,killall,prtstat,pstree} $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{fuser,prtstat,pstree} $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/killall $(1)/usr/libexec
endef endef
$(eval $(call BuildPackage,psmisc)) $(eval $(call BuildPackage,psmisc))