aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-01-06 19:44:52 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-01-13 19:54:44 +0100
commit423ec18116f333bd51ff5264b0b5c9edc02945c6 (patch)
tree5774002c53a3263e4ea90db2bfec0ecb4aeb9507
parentf0c702f124090470ec2b1140c576033e4e50fa1b (diff)
downloadupstream-423ec18116f333bd51ff5264b0b5c9edc02945c6.tar.gz
upstream-423ec18116f333bd51ff5264b0b5c9edc02945c6.tar.bz2
upstream-423ec18116f333bd51ff5264b0b5c9edc02945c6.zip
metadata: remove redundant fields from package hash
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rwxr-xr-xscripts/feeds6
-rw-r--r--scripts/metadata.pm3
-rwxr-xr-xscripts/package-metadata.pl8
3 files changed, 9 insertions, 8 deletions
diff --git a/scripts/feeds b/scripts/feeds
index 4ac6685b4d..4595c824a4 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -373,10 +373,14 @@ sub list {
return 0;
}
+# TODO: do_install_package etc. should deal with source packages rather
+# than binary packages
sub do_install_package($$) {
my $feed = shift;
my $pkg = shift;
- my $path = $pkg->{makefile};
+
+ my $path;
+ $pkg->{src} and $path = $pkg->{src}{makefile};
if($path) {
$path =~ s/\/Makefile$//;
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index f3c84e80c3..c0c967c01c 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -224,9 +224,7 @@ sub parse_package_metadata($) {
/^Package:\s*(.+?)\s*$/ and do {
undef $feature;
$pkg = {};
- $pkg->{ignore} = $src->{ignore};
$pkg->{src} = $src;
- $pkg->{makefile} = $src->{makefile};
$pkg->{name} = $1;
$pkg->{title} = "";
$pkg->{depends} = [];
@@ -273,7 +271,6 @@ sub parse_package_metadata($) {
name => $vpkg,
vdepends => [],
src => $src,
- makefile => $src->{makefile},
};
push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
}
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index dab960e677..7bffb2374c 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -290,7 +290,7 @@ sub print_package_config_category($) {
print "menu \"$menu\"\n";
}
foreach my $pkg (@pkgs) {
- next if $pkg->{ignore};
+ next if $pkg->{src}{ignore};
my $title = $pkg->{name};
my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
if ($c > 0) {
@@ -485,7 +485,7 @@ sub gen_package_mk() {
if (defined($pkg_dep) && defined($pkg_dep->{src})) {
unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{src}{buildtypes}}) {
warn sprintf "WARNING: Makefile '%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
- $src->{makefile}, $type, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile}, $type, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
next;
}
$idx = $pkg_dep->{src}{path};
@@ -539,7 +539,7 @@ sub gen_package_mk() {
if (defined $pkg_dep->{src}) {
unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{src}{buildtypes}}) {
warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
- $src->{makefile}, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile}, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
next;
}
$idx = $pkg_dep->{src}{path};
@@ -640,7 +640,7 @@ sub gen_package_license($) {
} else {
if ($level == 1) {
print "$pkg->{name}: Missing license! ";
- print "Please fix $pkg->{makefile}\n";
+ print "Please fix $pkg->{src}{makefile}\n";
}
}
}