diff options
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | package/findutils/Makefile | 1 | ||||
| -rwxr-xr-x | scripts/find | 9 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 16 | ||||
| -rwxr-xr-x | scripts/xargs | 9 |
5 files changed, 12 insertions, 25 deletions
diff --git a/mk/image.mk b/mk/image.mk index 2ce1b3444..e2982331b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -149,7 +149,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} - $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ + env PATH='${HOST_PATH}' $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list diff --git a/package/findutils/Makefile b/package/findutils/Makefile index 57fdf77b3..2848ac91c 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= utilities for finding files PKG_SECTION:= utils PKG_DEPENDS:= libpthread PKG_BUILDDEP:= autotool +HOST_BUILDDEP:= autotool PKG_URL:= http://www.gnu.org/software/findutils/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ diff --git a/scripts/find b/scripts/find deleted file mode 100755 index ea38d92fb..000000000 --- a/scripts/find +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -if [ -z "$(which gfind 2>/dev/null)" ];then - /usr/bin/find "$@" -else - gfind "$@" -fi diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 103f37411..16b13d4e3 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -247,16 +247,20 @@ fi host_build_findutils=0 if ! which gxargs >/dev/null 2>&1; then - if ! which xargs >/dev/null 2>&1; then - echo "No xargs found, will build one." - host_build_findutils=1 + if which xargs >/dev/null 2>&1; then + if ! xargs --version 2>/dev/null|grep GNU >/dev/null;then + echo "No GNU xargs found, will build one." + host_build_findutils=1 + fi fi fi if ! which gfind >/dev/null 2>&1; then - if ! which find >/dev/null 2>&1; then - echo "No find found, will build one." - host_build_findutils=1 + if which find >/dev/null 2>&1; then + if ! find --version 2>/dev/null|grep GNU >/dev/null;then + echo "No GNU find found, will build one." + host_build_findutils=1 + fi fi fi diff --git a/scripts/xargs b/scripts/xargs deleted file mode 100755 index cbe9bd015..000000000 --- a/scripts/xargs +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -if [ -z "$(which gxargs 2>/dev/null)" ];then - /usr/bin/xargs "$@" -else - gxargs "$@" -fi |