KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

detect whether the find command supports -L or -follow

Browse source 
SVN-Revision: 8002
This commit is contained in:
Felix Fietkau 2007-07-16 07:19:45 +00:00
parent 2809e403d6
commit 3e87d642f7
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/host.mk
View file

@ -5,7 +5,7 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TMP_DIR)/.host.mk -include $(TMP_DIR)/.host.mk
export TAR export TAR
@ -29,6 +29,11 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
echo "TAR:=$$TAR" >> $@; \ echo "TAR:=$$TAR" >> $@; \
echo "BASH:=$(shell which bash)" >> $@; \ echo "BASH:=$(shell which bash)" >> $@; \
if find -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \
echo 'FIND_L=find -L $$(1)' >>$@; \
else \
echo 'FIND_L=find $$(1) -follow' >> $@; \
fi; \
) )
endif endif

5
include/scan.mk
View file

@ -1,7 +1,10 @@
include $(TOPDIR)/include/verbose.mk include $(TOPDIR)/include/verbose.mk
TMP_DIR:=$(TOPDIR)/tmp
all: tmp/.$(SCAN_TARGET) all: tmp/.$(SCAN_TARGET)
include $(TOPDIR)/include/host.mk
SCAN_TARGET ?= packageinfo SCAN_TARGET ?= packageinfo
SCAN_NAME ?= package SCAN_NAME ?= package
SCAN_DIR ?= package SCAN_DIR ?= package
@ -31,7 +34,7 @@ endef
$(FILELIST): $(FILELIST):
rm -f tmp/info/.files-$(SCAN_TARGET)-* rm -f tmp/info/.files-$(SCAN_TARGET)-*
find -follow $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@ $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST) tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
( \ ( \