From c92165038217e49075098479704da58a2a3a89bd Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 12 Feb 2021 11:16:35 +0100 Subject: build: drop ABI version from metadata Preparation for supporting dynamic ABI versions that depend on the runtime configuration. Read the suffix from the staging dir pkginfo version files. Signed-off-by: Felix Fietkau --- scripts/metadata.pm | 1 - scripts/package-metadata.pl | 15 --------------- 2 files changed, 16 deletions(-) (limited to 'scripts') diff --git a/scripts/metadata.pm b/scripts/metadata.pm index f6dce39662..5fbb77a36c 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -249,7 +249,6 @@ sub parse_package_metadata($) { /^Build-Types:\s*(.+)\s*$/ and $src->{buildtypes} = [ split /\s+/, $1 ]; next unless $pkg; /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; - /^ABIVersion: \s*(.+)\s*$/ and $pkg->{abiversion} = $1; /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1; /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1; /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1; diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl index 5abc1bdef3..02102be8f3 100755 --- a/scripts/package-metadata.pl +++ b/scripts/package-metadata.pl @@ -532,21 +532,6 @@ sub gen_package_auxiliary() { if ($pkg->{name} && $pkg->{repository}) { print "Package/$name/subdir = $pkg->{repository}\n"; } - if ($pkg->{name} && defined($pkg->{abiversion}) && length($pkg->{abiversion})) { - my $abiv; - - 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"; - $abiv = "$1$2$3"; - } - else { - $abiv = $pkg->{abiversion}; - } - - foreach my $n (@{$pkg->{provides}}) { - print "Package/$n/abiversion = $abiv\n"; - } - } my %depends; foreach my $dep (@{$pkg->{depends} || []}) { if ($dep =~ m!^\+?(?:[^:]+:)?([^@]+)$!) { -- cgit v1.2.3