-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7862 from cshoredaniel/pr-findutils-alternatives
findutils: Fix conflict with busybox find/xargs
- Loading branch information
Showing
1 changed file
with
15 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
@@ -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)) | ||
|
|
||