summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-09-29 01:21:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-09-29 01:21:56 +0000
commit97b61354626866dd2483c2a283ab9b2bc087ac74 (patch)
tree4ca23a9af854189fb18b7e81268a7c0089890335 /scripts
parent03543ec4a4ee24df583843d386a7a39372865961 (diff)
downloadmaster-31e0f0ae-97b61354626866dd2483c2a283ab9b2bc087ac74.tar.gz
master-31e0f0ae-97b61354626866dd2483c2a283ab9b2bc087ac74.tar.bz2
master-31e0f0ae-97b61354626866dd2483c2a283ab9b2bc087ac74.zip
add a packaging method that installs files into a subdirectory of bin/ instead of an ipkg
SVN-Revision: 9060
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl2
-rw-r--r--scripts/metadata.pm8
2 files changed, 9 insertions, 1 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index f3d6e9df2c..aa5df6fb9d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -361,7 +361,7 @@ sub print_package_config_category($) {
print "\t";
$pkg->{menu} and print "menu";
print "config PACKAGE_".$pkg->{name}."\n";
- print "\t\ttristate \"$title\"\n";
+ print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n";
print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n";
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index f90446298a..ff39e346ea 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -63,6 +63,7 @@ sub parse_package_metadata($) {
$pkg->{depends} = [];
$pkg->{builddepends} = [];
$pkg->{subdir} = $subdir;
+ $pkg->{tristate} = 1;
$package{$1} = $pkg;
push @{$srcpackage{$src}}, $pkg;
};
@@ -88,6 +89,13 @@ sub parse_package_metadata($) {
push @{$category{$1}->{$src}}, $pkg;
};
/^Description: \s*(.*)\s*$/ and $pkg->{description} = "\t\t $1\n". get_multiline(*FILE, "\t\t ");
+ /^Type: \s*(.+)\s*$/ and do {
+ $pkg->{type} = [ split /\s+/, $1 ];
+ undef $pkg->{tristate};
+ foreach my $type (@{$pkg->{type}}) {
+ $type =~ /ipkg/ and $pkg->{tristate} = 1;
+ }
+ };
/^Config: \s*(.*)\s*$/ and $pkg->{config} = "$1\n".get_multiline(*FILE);
/^Prereq-Check:/ and $pkg->{prereq} = 1;
/^Preconfig:\s*(.+)\s*$/ and do {