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

build: expose ABI version in .packageauxvars

Browse Source 
Subdequent commits need this information to resolve the ABI version when
computing binary ipk dependencies.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2019-01-18 12:43:06 +01:00
parent 2d9d57b9de
commit e3d5b384aa
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/package-dumpinfo.mk
View File

@@ -24,7 +24,8 @@ $(if $(MENU),Menu: $(MENU)
)$(if $(DEFAULT),Default: $(DEFAULT) )$(if $(DEFAULT),Default: $(DEFAULT)
)$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1 )$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1
)Version: $(VERSION) )Version: $(VERSION)
Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS)) $(if $(ABI_VERSION),ABIVersion: $(ABI_VERSION)
)Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
Conflicts: $(CONFLICTS) Conflicts: $(CONFLICTS)
Menu-Depends: $(MDEPENDS) Menu-Depends: $(MDEPENDS)
Provides: $(PROVIDES) Provides: $(PROVIDES)

1
scripts/metadata.pm
View File

@@ -238,6 +238,7 @@ sub parse_package_metadata($) {
/^Build-Types:\s*(.+)\s*$/ and $src->{buildtypes} = [ split /\s+/, $1 ]; /^Build-Types:\s*(.+)\s*$/ and $src->{buildtypes} = [ split /\s+/, $1 ];
next unless $pkg; next unless $pkg;
/^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
/^ABIVersion: \s*(.+)\s*$/ and $pkg->{abiversion} = $1;
/^Title: \s*(.+)\s*$/ and $pkg->{title} = $1; /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
/^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;

9
scripts/package-metadata.pl
View File

@@ -516,6 +516,15 @@ sub gen_package_auxiliary() {
if ($pkg->{name} && $pkg->{repository}) { if ($pkg->{name} && $pkg->{repository}) {
print "Package/$name/subdir = $pkg->{repository}\n"; print "Package/$name/subdir = $pkg->{repository}\n";
} }
if ($pkg->{name} && defined($pkg->{abiversion})) {
if ($pkg->{abiversion} =~ m!^(\d{4})-(\d{2})-(\d{2})-[0-9a-f]{7,40}$!) {
print STDERR "WARNING: Reducing ABI version '$pkg->{abiversion}' of package '$name' to '$1$2$3'\n";
print "Package/$name/abiversion = $1$2$3\n";
}
elsif (length $pkg->{abiversion}) {
print "Package/$name/abiversion = $pkg->{abiversion}\n";
}
}
} }
} }