Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

findutils: Fix conflict with busybox find/xargs #7862

Merged
merged 1 commit into from Jan 5, 2019
Merged

findutils: Fix conflict with busybox find/xargs #7862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions utils/findutils/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>

PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
Expand Down Expand Up @@ -47,16 +48,18 @@ endef
define Package/findutils-find
$(call Package/findutils/Default)
TITLE+= - find utility
ALTERNATIVES:=300:/usr/bin/find:/usr/libexec/findutils-find
endef

define Package/findutils-locate
define Package/findutils-xargs
$(call Package/findutils/Default)
TITLE+= - locate and updatedb utility
TITLE+= - xargs utility
ALTERNATIVES:=300:/usr/bin/xargs:/usr/libexec/findutils-xargs
endef

define Package/findutils-xargs
define Package/findutils-locate
$(call Package/findutils/Default)
TITLE+= - xargs utility
TITLE+= - locate and updatedb utility
endef

CONFIGURE_ARGS += --localstatedir=/srv/var
Expand All @@ -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
Expand All @@ -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))
Expand Down