allow kconfig symbols to be shared between packages
[openwrt.org/openwrt.git] / scripts / metadata.pl
blob:a/scripts/metadata.pl -> blob:b/scripts/metadata.pl
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -247,12 +247,11 @@
 		/broken/ and $ret .= "\tdepends BROKEN\n";
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
-		/atm/ and $ret .= "\tselect ATM_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
-		/video/ and $ret .= "\tselect VIDEO_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
 		/ext2/ and $ret .= "\tselect USES_EXT2\n";
+		/tgz/ and $ret .= "\tselect USES_TGZ\n";
 	}
 	return $ret;
 }
@@ -557,7 +556,7 @@
 		}
 		if ($config) {
 			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
-			$pkg->{prereq} and print "prereq-$config += $pkg->{src}\n";
+			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
 		}
 	
 		my $hasdeps = 0;
@@ -577,12 +576,12 @@
 			undef $idx if $idx =~ /^(kernel)|(base-files)$/;
 			if ($idx) {
 				next if $dep{$pkg->{src}."->".$idx};
-				$depline .= " $idx\-compile";
+				$depline .= " \$(curdir)/$idx/compile";
 				$dep{$pkg->{src}."->".$idx} = 1;
 			}
 		}
 		if ($depline) {
-			$line .= $pkg->{subdir}."$pkg->{src}-compile: $depline\n";
+			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile := $depline\n";
 		}
 	}
 	
@@ -605,7 +604,7 @@
 	) > \$@
 	
 ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
-  preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
 endif
 EOF
 	}

comments