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

Merge pull request #7862 from cshoredaniel/pr-findutils-alternatives

Browse source 
findutils: Fix conflict with busybox find/xargs
This commit is contained in:
Hannu Nyman 2019-01-05 20:07:50 +02:00 committed by GitHub
commit 6101062547
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
utils/findutils/Makefile
View file

@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=findutils
PKG_VERSION:=4.6.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
PKG_MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
@ -47,16 +48,18 @@ endef
define Package/findutils-find
$(call Package/findutils/Default)
TITLE+= - find utility
endef
define Package/findutils-locate
$(call Package/findutils/Default)
TITLE+= - locate and updatedb utility
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/findutils-find
endef
define Package/findutils-xargs
$(call Package/findutils/Default)
TITLE+= - xargs utility
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/findutils-xargs
endef
define Package/findutils-locate
$(call Package/findutils/Default)
TITLE+= - locate and updatedb utility
endef
CONFIGURE_ARGS += --localstatedir=/srv/var
@ -67,8 +70,13 @@ define Package/findutils/install
endef
define Package/findutils-find/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/libexec/findutils-find
endef
define Package/findutils-xargs/install
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/libexec/findutils-xargs
endef
define Package/findutils-locate/install
@ -78,11 +86,6 @@ define Package/findutils-locate/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/
endef
define Package/findutils-xargs/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/bin/
endef
$(eval $(call BuildPackage,findutils))
$(eval $(call BuildPackage,findutils-find))
$(eval $(call BuildPackage,findutils-locate))