diff options
| author | John Crispin <blogic@openwrt.org> | 2015-01-22 13:13:09 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-01-22 13:13:09 +0000 |
| commit | 6b66328ef4da52e119960fb2cade0d55a6c667c0 (patch) | |
| tree | c9e4655320af1c3f6d4cf6c42b78b7f1a9fad3d5 /include | |
| parent | 9154a994801e65cc1e43ed7af7881c00ce26ac10 (diff) | |
| download | master-187ad058-6b66328ef4da52e119960fb2cade0d55a6c667c0.tar.gz master-187ad058-6b66328ef4da52e119960fb2cade0d55a6c667c0.tar.bz2 master-187ad058-6b66328ef4da52e119960fb2cade0d55a6c667c0.zip | |
build: revert r44076
the patch causes issues when installing feeds
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44078 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/scan.awk | 17 | ||||
| -rw-r--r-- | include/scan.mk | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/include/scan.awk b/include/scan.awk deleted file mode 100644 index 39b2977228..0000000000 --- a/include/scan.awk +++ /dev/null @@ -1,17 +0,0 @@ -BEGIN { FS="/" } -$1 ~ /^feeds/ { FEEDS[$NF]=$0 } -$1 !~ /^feeds/ { PKGS[$NF]=$0 } -END { - # Filter-out OpenWrt packages which have a feeds equivalent - for (pkg in PKGS) - if (pkg in FEEDS) - delete PKGS[pkg] - n = asort(PKGS) - for (i=1; i <= n; i++) { - print PKGS[i] - } - n = asort(FEEDS) - for (i=1; i <= n; i++){ - print FEEDS[i] - } -} diff --git a/include/scan.mk b/include/scan.mk index 138707db08..0998333439 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -43,7 +43,7 @@ endef $(FILELIST): rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-* - $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -f include/scan.awk > $@ + $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST) ( \ |