fixes for recursive package scanning
authorFelix Fietkau <nbd@openwrt.org>
Sun, 15 Jul 2007 23:16:47 +0000 (23:16 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 15 Jul 2007 23:16:47 +0000 (23:16 +0000)
SVN-Revision: 7982

include/scan.mk
scripts/metadata.pl

index 01f49ad..cd1e47e 100644 (file)
@@ -20,11 +20,11 @@ endif
 
 define PackageDir
   tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(1)
-  tmp/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(1)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(1)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(1)/$(DEP))))
+  tmp/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(1)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(1)/$(DEP))))
        { \
-               $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(1)) \
-               echo Source-Makefile: $(SCAN_DIR)/$(1)/Makefile; \
-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(1) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(1)/Makefile" >&2; \
+               $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
+               echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
+               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(2) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(2)/Makefile" >&2; \
                echo; \
        } > $$@ || true
 endef
@@ -37,7 +37,9 @@ tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
        ( \
                cat $< | awk '{print "$(SCAN_DIR)/" $$0 "/Makefile" }' | xargs grep -HE '^ *SCAN_DEPS *= *' | awk -F: '{ gsub(/^.*DEPS *= */, "", $$2); print "DEPS_" $$1 "=" $$2 }'; \
                awk -v deps="$$DEPS" '{ \
-                       print "$$(eval $$(call PackageDir," $$0 "))"; \
+                       info=$$0; \
+                       gsub(/\//, "_", info); \
+                       print "$$(eval $$(call PackageDir," info "," $$0 "))"; \
                } ' < $<; \
                true; \
        ) > $@
@@ -57,7 +59,7 @@ $(TARGET_STAMP):
 
 tmp/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
        $(call progress,Collecting $(SCAN_NAME) info: merging...)
-       cat $(FILELIST) | awk '{print "tmp/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
+       cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "tmp/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
        $(call progress,Collecting $(SCAN_NAME) info: done)
        echo
 
index dbd6cce..e8a7c1b 100755 (executable)
@@ -72,12 +72,15 @@ sub parse_package_metadata() {
        my $pkg;
        my $makefile;
        my $preconfig;
+       my $subdir;
        my $src;
        while (<>) {
                chomp;
-               /^Source-Makefile: \s*(.+\/([^\/]+)\/Makefile)\s*$/ and do {
+               /^Source-Makefile: \s*((.+\/)([^\/]+)\/Makefile)\s*$/ and do {
                        $makefile = $1;
-                       $src = $2;
+                       $subdir = $2;
+                       $src = $3;
+                       $subdir =~ s/^package\///;
                        $srcpackage{$src} = [];
                        undef $pkg;
                };
@@ -89,6 +92,7 @@ sub parse_package_metadata() {
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{builddepends} = [];
+                       $pkg->{subdir} = $subdir;
                        $package{$1} = $pkg;
                        push @{$srcpackage{$src}}, $pkg;
                };
@@ -503,7 +507,7 @@ sub gen_package_mk() {
                        $config = "\$(CONFIG_PACKAGE_$name)"
                }
                if ($config) {
-                       print "package-$config += $pkg->{src}\n";
+                       print "package-$config += $pkg->{subdir}$pkg->{src}\n";
                        $pkg->{prereq} and print "prereq-$config += $pkg->{src}\n";
                }
        
@@ -519,7 +523,7 @@ sub gen_package_mk() {
                        next if defined $pkg_dep->{vdepends};
 
                        if (defined $pkg_dep->{src}) {
-                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{src};
+                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
                        } elsif (defined($pkg_dep) && !defined($ENV{SDK})) {
                                $idx = $dep;
                        }
@@ -531,7 +535,7 @@ sub gen_package_mk() {
                        }
                }
                if ($depline) {
-                       $line .= "$pkg->{src}-compile: $depline\n";
+                       $line .= $pkg->{subdir}."$pkg->{src}-compile: $depline\n";
                }
        }