domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added source distribution to package dump, used by our SDK (include source distributions for offline usage) added bugfix for sub-targets added bugfix for help info (thanks to Thomas)

Browse Source 
SVN-Revision: 14703
This commit is contained in:
Ralph Hempel
2009-03-01 09:35:53 +00:00
parent 1ca2da992f
commit 6ae7a0f94f
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/package-dumpinfo.mk
View File

@@ -28,6 +28,7 @@ ifneq ($(DUMP),)
echo "Category: $(CATEGORY)"; \ echo "Category: $(CATEGORY)"; \
echo "Title: $(TITLE)"; \ echo "Title: $(TITLE)"; \
echo "Maintainer: $(MAINTAINER)"; \ echo "Maintainer: $(MAINTAINER)"; \
echo "Source: $(PKG_SOURCE)"; \
echo "Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))"; \ echo "Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))"; \
$(if $(KCONFIG),echo "Kernel-Config: $(KCONFIG)";) \ $(if $(KCONFIG),echo "Kernel-Config: $(KCONFIG)";) \
$(if $(BUILDONLY),echo "Build-Only: $(BUILDONLY)";) \ $(if $(BUILDONLY),echo "Build-Only: $(BUILDONLY)";) \

29
scripts/metadata.pl
View File

@@ -201,12 +201,20 @@ sub print_target($) {
} }
my $v = kver($target->{version}); my $v = kver($target->{version});
if (@{$target->{subtargets}} == 0) {
$confstr = <<EOF; $confstr = <<EOF;
config TARGET_$target->{conf} config TARGET_$target->{conf}
bool "$target->{name}" bool "$target->{name}"
select LINUX_$kernel select LINUX_$kernel
select LINUX_$v select LINUX_$v
EOF EOF
}
else {
$confstr = <<EOF;
config TARGET_$target->{conf}
bool "$target->{name}"
EOF
}
if ($target->{subtarget}) { if ($target->{subtarget}) {
$confstr .= "\tdepends TARGET_$target->{boardconf}\n"; $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
} }
@@ -293,7 +301,14 @@ EOF
print "\tselect DEFAULT_$pkg\n"; print "\tselect DEFAULT_$pkg\n";
$defaults{$pkg} = 1; $defaults{$pkg} = 1;
} }
print "\n"; my $help = $profile->{desc};
if ($help =~ /\w+/) {
$help =~ s/^\s*/\t /mg;
$help = "\thelp\n$help";
} else {
undef $help;
}
print "$help\n";
} }
} }
@@ -651,6 +666,16 @@ EOF
} }
} }
sub gen_package_source() {
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $pkg = $package{$name};
if ($pkg->{name} && $pkg->{source}) {
print "$pkg->{name}: ";
print "$pkg->{source}\n";
}
}
}
sub parse_command() { sub parse_command() {
my $cmd = shift @ARGV; my $cmd = shift @ARGV;
@@ -659,6 +684,7 @@ sub parse_command() {
/^package_mk$/ and return gen_package_mk(); /^package_mk$/ and return gen_package_mk();
/^package_config$/ and return gen_package_config(); /^package_config$/ and return gen_package_config();
/^kconfig/ and return gen_kconfig_overrides(); /^kconfig/ and return gen_kconfig_overrides();
/^package_source$/ and return gen_package_source();
} }
print <<EOF print <<EOF
Available Commands: Available Commands:
@@ -666,6 +692,7 @@ Available Commands:
$0 package_mk [file] Package metadata in makefile format $0 package_mk [file] Package metadata in makefile format
$0 package_config [file] Package metadata in Kconfig format $0 package_config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] Kernel config overrides $0 kconfig [file] [config] Kernel config overrides
$0 package_source [file] Package source file information
EOF EOF
} }

1
scripts/metadata.pm
View File

@@ -73,6 +73,7 @@ sub parse_package_metadata($) {
/^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1; /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
/^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1; /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
/^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1; /^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
/^Source: \s*(.+)\s*$/ and $pkg->{source} = $1;
/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1; /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
/^Provides: \s*(.+)\s*$/ and do { /^Provides: \s*(.+)\s*$/ and do {
my @vpkg = split /\s+/, $1; my @vpkg = split /\s+/, $1;