KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

only check prerequisites of actually selected packages

Browse source 
SVN-Revision: 5055
This commit is contained in:
Felix Fietkau 2006-10-12 17:45:22 +00:00
parent 73b292d5f5
commit 1f981bcc8a
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openwrt/package/Makefile
View file

@ -11,7 +11,7 @@ include $(TOPDIR)/.config
include $(TOPDIR)/.pkgdeps
include $(TOPDIR)/host.mk
PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-prereq))
PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))

20
openwrt/scripts/gen_deps.pl
View file

@ -14,7 +14,6 @@ my $makefile;
my %conf;
my %pkg;
my %prereq;
my $prereq;
my %dep;
my %options;
my $opt;
@ -36,8 +35,7 @@ while ($line = <>) {
$pkg{$name}->{src} = $src;
};
$line =~ /^Prereq-Check:/ and !defined $prereq{$src} and do {
$prereq{$src} = 1;
$prereq .= "package-prereq += $src\n";
$pkg{$name}->{prereq} = 1;
};
$line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
$pkg{$name}->{depends} ||= [];
@ -52,11 +50,19 @@ while ($line = <>) {
$line="";
foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
my $config;
if ($options{SDK}) {
$conf{$pkg{$name}->{src}} or print "package-m += $pkg{$name}->{src}\n";
$conf{$pkg{$name}->{src}} = 1;
$conf{$pkg{$name}->{src}} or do {
$config = 'm';
$conf{$pkg{$name}->{src}} = 1;
};
} else {
print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
$config = "\$(CONFIG_PACKAGE_$name)"
}
if ($config) {
print "package-$config += $pkg{$name}->{src}\n";
$pkg{$name}->{prereq} and print "prereq-$config += $pkg{$name}->{src}\n";
}
my $hasdeps = 0;
@ -81,5 +87,5 @@ foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
}
if ($line ne "") {
print "\n$line\n$prereq";
print "\n$line";
}