X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/330b8a44a5d7a650b0f5348f2dee4f9c9b786477..b40bc2899b2e399c07e4b0b1dda0f9cfcb9c8b5a:/scripts/metadata.pl diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 70d1b4025..63809c496 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -162,7 +162,7 @@ sub target_config_features(@) { /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"; + /targz/ and $ret .= "\tselect USES_TARGZ\n"; /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; /ubifs/ and $ret .= "\tselect USES_UBIFS\n"; /fpu/ and $ret .= "\tselect HAS_FPU\n"; @@ -263,7 +263,7 @@ sub gen_target_config() { print <{$depend}; - $seen->{$depend} = 1; + next if $condition eq $depend; + next if $seen->{"$parent_condition:$depend"}; + $seen->{"$parent_condition:$depend"} = 1; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { if ($condition) {