hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

properly support dependencies on packages that just use Build/DefaultTargets

Browse Source 
SVN-Revision: 7983
master
Felix Fietkau 18 years ago
parent 7b16475eb7
commit de2aa28c4c
2 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      include/scan.mk
  2. 8
      scripts/metadata.pl

2
include/scan.mk
Unescape View File

@ -31,7 +31,7 @@ endef
$(FILELIST): $(FILELIST):
rm -f tmp/info/.files-$(SCAN_TARGET)-* rm -f tmp/info/.files-$(SCAN_TARGET)-*
find $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@ find $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST) tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
( \ ( \

8
scripts/metadata.pl
Unescape View File

@ -4,6 +4,7 @@ my %preconfig;
my %package; my %package;
my %srcpackage; my %srcpackage;
my %category; my %category;
my %subdir;
sub get_multiline { sub get_multiline {
my $prefix = shift; my $prefix = shift;
@ -81,6 +82,7 @@ sub parse_package_metadata() {
$subdir = $2; $subdir = $2;
$src = $3; $src = $3;
$subdir =~ s/^package\///; $subdir =~ s/^package\///;
$subdir{$src} = $subdir;
$srcpackage{$src} = []; $srcpackage{$src} = [];
undef $pkg; undef $pkg;
}; };
@ -518,14 +520,12 @@ sub gen_package_mk() {
$dep =~ s/\+//; $dep =~ s/\+//;
my $idx; my $idx;
my $pkg_dep = $package{$dep}; my $pkg_dep = $package{$dep};
$pkg_dep or $pkg_dep = $srcpackage{$dep}->[0];
next unless defined $pkg_dep;
next if defined $pkg_dep->{vdepends}; next if defined $pkg_dep->{vdepends};
if (defined $pkg_dep->{src}) { if (defined $pkg_dep->{src}) {
($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src}; ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
} elsif (defined($pkg_dep) && !defined($ENV{SDK})) { } elsif (defined($srcpackage{$dep})) {
$idx = $dep; $idx = $subdir{$dep}.$dep;
} }
undef $idx if $idx =~ /^(kernel)|(base-files)$/; undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) { if ($idx) {

Write Preview
Loading…
Cancel
Save