Add support for architecture wildcards, but for now they will only be

exposed in debian/control files, not in binary nor source packages.
Closes: #291939

ChangeLog

@@ -1,3 +1,39 @@
+2006-01-23  Guillem Jover  <guillem@debian.org>
+
+	Support for architecture wildcards.
+
+	* scripts/controllib.pl: Rename to ...
+	* scripts/controllib.pl.in: ... this.
+	* scripts/dpkg-architecture.pl: Add new actions '-e'  and '-i' that
+	call debian_arch_eq and debian_arch_is, to check for architecture
+	equality and identity respectively. Use debian_arch_fix instead of
+	the duplicated code.
+	(pkgdatadir, read_cputable, read_ostable): Move to ...
+	* scripts/controllib.pl.in: ... here.
+	(debian_arch_fix): New function. Fix normalized kernel-cpu input to
+	legacy Debian architecture output.
+	(debian_arch_split): New function. Normalize and split input into
+	kernel and cpu components.
+	(debian_arch_eq): New function. Compare two tuples for equality after
+	having normalized them with debian_arch_split.
+	(debian_arch_is): New function. Check two tuples for identity after
+	having normalized them with debian_arch_split.
+	(debian_arch_expand): New function. Expand the normalized input
+	into all possible legacy Debian architectures matching the wildcard.
+	(parsedep): Use debian_arch_is to check if the host architecture is
+	part of the architecture listed in the dependency relationship.
+	(showdep): Use debian_arch_expand to normalize the architectures for
+	binary and source packages, so generated packages will be backward
+	compatible in regard to architecture format.
+	* scripts/dpkg-genchanges.pl: Use new dpkg_arch_is and dpkg_arch_eq
+	instead of the hardcoded checks.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise. Use dpkg_arch_expand to fill
+	the Architecture field with the legacy Debian architecures.
+	* scripts/Makefile.am: New rule to generate .pl from .pl.in files.
+	* man/C/dpkg-architecture.1: Update. Add new options, and few words
+	about the format of the wildcards.
+
 2006-01-23  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-source.pl: Add a missing '+' in the architecture

debian/changelog

@@ -77,6 +77,9 @@ dpkg (1.13.12~) unstable; urgency=low
     transitive library. The proper fix should come with a pkg-config file.
     Based on a patch by Bart Martens <bart.martens@advalvas.be>.
     Closes: #347744, #348659
+  * Add support for architecture wildcards, but for now they will only be
+    exposed in debian/control files, not in binary nor source packages.
+    Closes: #291939
 
  --
 

man/C/dpkg-architecture.1

@@ -1,4 +1,4 @@
-.TH DPKG-ARCHITECTURE 1 "2005-01-10" "Debian GNU/Linux"
+.TH DPKG-ARCHITECTURE 1 "2006-01-23" "Debian GNU/Linux"
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 .SH "SYNOPSIS"
@@ -11,8 +11,8 @@ Valid options:
 \&\fB\-f\fR
 .PP
 Valid actions:
-\&\fB\-l\fR, \fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command,
-\fB\-L\fR
+\&\fB\-l\fR, \fB\-e\fRDebian\-Architecture, \fB\-i\fRArchitecture\-Alias,
+\fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command, \fB\-L\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 dpkg-architecture does provide a facility to determine and set the build and
@@ -30,8 +30,12 @@ Indeed, it is often better to only specify one, because dpkg-architecture
 will warn you if your choice doesn't match the default.
 .PP
 The default action is \fB\-l\fR, which prints the environment variables, one each line,
-in the format VARIABLE=value. If you are only interested in the value of a
-single variable, you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export
+in the format VARIABLE=value. If you want to check for equality between two
+Debian Architectures, you can use \fB\-e\fR, by default it will compare against
+the currect Debian Architecture, being it the host. If you want to check for
+identity of the current Debian Architecture against an Architecture Alias, you
+can use \fB\-i\fR. If you are only interested in the value of a single variable,
+you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export
 command. This can be used to set the environment variables using eval. \fB\-u\fR
 does return a similar command to unset all variables. \fB\-c\fR does execute a
 command in an environment which has all variables set to the determined
@@ -55,6 +59,11 @@ The machine the package is built for.
 .IX Item "Debian Architecture"
 The Debian architecture string, which specifies the binary tree in the \s-1FTP\s0
 archive. Examples: i386, sparc, hurd\-i386.
+.IP "Architecture Alias" 4
+.IX Item "Architecture Alias"
+An architecture alias is a wildcard architecture that will match any real
+architecture being part of it. The general form is <kernel>\-<cpu>.
+Examples: linux\-any, linux\-alpha, any\-i386, hurd\-any.
 .IP "\s-1GNU\s0 System Type" 4
 .IX Item "GNU System Type"
 An architecture specification string consisting of two parts,

scripts/Makefile.am

@@ -70,6 +70,11 @@ do_shell_subst = sed -e "s:version=\"[^\"]*\":version=\"$(PACKAGE_VERSION)\":"
 	$(do_perl_subst) <$< >$@
 	chmod +x $@
 
+%.pl: %.pl.in Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_perl_subst) <$< >$@
+	chmod +x $@
+
 %: %.sh Makefile
 	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
 	$(do_shell_subst) <$< >$@

scripts/Makefile.in

@@ -509,6 +509,11 @@ uninstall-am: uninstall-binSCRIPTS uninstall-changelogSCRIPTS \
 	$(do_perl_subst) <$< >$@
 	chmod +x $@
 
+%.pl: %.pl.in Makefile
+	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	$(do_perl_subst) <$< >$@
+	chmod +x $@
+
 %: %.sh Makefile
 	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
 	$(do_shell_subst) <$< >$@

scripts/controllib.pl

@@ -11,6 +11,8 @@
 #                     "S key" where S is the source and key is the packagename
 # %substvar         - map with substitution variables
 
+$pkgdatadir=".";
+
 $parsechangelog= 'dpkg-parsechangelog';
 
 @pkg_dep_fields = qw(Replaces Provides Depends Pre-Depends Recommends Suggests
@@ -76,6 +78,114 @@ sub findarch {
     $substvar{'Arch'}= $arch;
 }
 
+sub read_cputable {
+    open CPUTABLE, "$pkgdatadir/cputable"
+	or &syserr("unable to open cputable");
+    while (<CPUTABLE>) {
+	if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
+	    $cputable{$1} = $2;
+	    $cputable_re{$1} = $3;
+	    push @cpu, $1;
+	}
+    }
+    close CPUTABLE;
+}
+
+sub read_ostable {
+    open OSTABLE, "$pkgdatadir/ostable"
+	or &syserr("unable to open ostable");
+    while (<OSTABLE>) {
+	if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
+	    $ostable{$1} = $2;
+	    $ostable_re{$1} = $3;
+	    push @os, $1;
+	}
+    }
+    close OSTABLE;
+}
+
+sub debian_arch_fix
+{
+    local ($os, $cpu) = @_;
+
+    if ($os eq "linux") {
+	return $cpu;
+    } else {
+	return "$os-$cpu";
+    }
+}
+
+sub debian_arch_split {
+    local ($_) = @_;
+
+    if (/^([^-]*)-(.*)/) {
+	return ($1, $2);
+    } elsif (/any/ || /all/) {
+	return ($_, $_);
+    } else {
+	return ("linux", $_);
+    }
+}
+
+sub debian_arch_eq {
+    my ($a, $b) = @_;
+    my ($a_os, $a_cpu) = debian_arch_split($a);
+    my ($b_os, $b_cpu) = debian_arch_split($b);
+
+    return ("$a_os-$a_cpu" eq "$b_os-$b_cpu");
+}
+
+sub debian_arch_is {
+    my ($real, $alias) = @_;
+    my ($real_os, $real_cpu) = debian_arch_split($real);
+    my ($alias_os, $alias_cpu) = debian_arch_split($alias);
+
+    if ("$real_os-$real_cpu" eq "$alias_os-$alias_cpu") {
+	return 1;
+    } elsif ("$alias_os-$alias_cpu" eq "any-any") {
+	return 1;
+    } elsif ("$alias_os-$alias_cpu" eq "any-$real_cpu") {
+	return 1;
+    } elsif ("$alias_os-$alias_cpu" eq "$real_os-any") {
+	return 1;
+    }
+
+    return 0;
+}
+
+&read_cputable;
+&read_ostable;
+
+sub debian_arch_expand
+{
+    local ($_) = @_;
+
+    /^(!)?(.*)/;
+
+    local $not = $1 || '';
+    local $arch = $2;
+    local ($os, $cpu) = debian_arch_split($arch);
+    local @list;
+
+    if ("$os-$cpu" eq 'any-any') {
+	@list = 'any';
+    } elsif ($os eq 'all' or $cpu eq 'all') {
+	@list = 'all';
+    } elsif ($cpu eq 'any') {
+	foreach my $_cpu (@cpu) {
+	    push @list, $not.debian_arch_fix($os, $_cpu);
+	}
+    } elsif ($os eq 'any') {
+	foreach my $_os (@os) {
+	    push @list, $not.debian_arch_fix($_os, $cpu);
+	}
+    } else {
+	push @list, $not.debian_arch_fix($os, $cpu);
+    }
+
+    return @list;
+}
+
 sub substvars {
     my ($v) = @_;
     my ($lhs,$vn,$rhs,$count);
@@ -186,17 +296,21 @@ ALTERNATE:
                 my $seen_arch='';
                 foreach my $arch (@arches) {
                     $arch=lc($arch);
-                    if ($arch eq $host_arch) {
+                    if (debian_arch_is($host_arch, $arch)) {
                         $seen_arch=1;
                         next;
-                    } elsif ($arch eq "!$host_arch") {
-                        next ALTERNATE;
-                    } elsif ($arch =~ /!/) {
-                        # This is equivilant to
-                        # having seen the current arch,
-                        # unless the current arch
-                        # is also listed..
-                        $seen_arch=1;
+                    } elsif ($arch =~ /^!/) {
+			($not_arch = $arch) =~ s/^!//;
+
+			if (debian_arch_is($host_arch, $not_arch)) {
+			    next ALTERNATE;
+			} else {
+			    # This is equivilant to
+			    # having seen the current arch,
+			    # unless the current arch
+			    # is also listed..
+			    $seen_arch=1;
+			}
                     }
                 }
                 if (! $seen_arch) {
@@ -221,7 +335,9 @@ sub showdep {
         my @or_list = ();
         foreach my $dep_or (@$dep_and) {
             my ($package, $relation, $version, $arch_list) = @$dep_or; 
-            push @or_list, $package . ($relation && $version ? " ($relation $version)" : '') . ($show_arch && @$arch_list ? " [@$arch_list]" : '');
+            my @arches = map(debian_arch_expand($_), @$arch_list);
+            chomp @arches;
+            push @or_list, $package . ($relation && $version ? " ($relation $version)" : '') . ($show_arch && @arches ? " [@arches]" : '');
         }
         push @and_list, join(' | ', @or_list);
     }

scripts/dpkg-architecture.pl

@@ -26,8 +26,6 @@ $dpkglibdir="/usr/lib/dpkg";
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
-$pkgdatadir=".";
-
 sub usageversion {
     print STDERR
 "Debian $0 $version.
@@ -39,12 +37,14 @@ version 2 or later for copying conditions.  There is NO warranty.
 Usage:
   $0 [<option> ...] [<action>]
 Options:
-       -a<debian-arch>    set Debian architecture
-       -t<gnu-system>     set GNU system type 
+       -a<debian-arch>    set current Debian architecture
+       -t<gnu-system>     set current GNU system type
        -L                 list valid architectures
        -f                 force flag (override variables set in environment)
 Actions:
        -l                 list variables (default)
+       -e<debian-arch>    compare with current Debian architecture
+       -i<arch-alias>     check if current Debian architecture is <arch-alias>
        -q<variable>       prints only the value of <variable>.
        -s                 print command to set environment variables
        -u                 print command to unset environment variables
@@ -52,32 +52,6 @@ Actions:
 ";
 }
 
-sub read_cputable {
-    open CPUTABLE, "$pkgdatadir/cputable"
-	or &syserr("unable to open cputable");
-    while (<CPUTABLE>) {
-	if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
-	    $cputable{$1} = $2;
-	    $cputable_re{$1} = $3;
-	    push @cpu, $1;
-	}
-    }
-    close CPUTABLE;
-}
-
-sub read_ostable {
-    open OSTABLE, "$pkgdatadir/ostable"
-	or &syserr("unable to open ostable");
-    while (<OSTABLE>) {
-	if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
-	    $ostable{$1} = $2;
-	    $ostable_re{$1} = $3;
-	    push @os, $1;
-	}
-    }
-    close OSTABLE;
-}
-
 sub split_debian {
     local ($_) = @_;
     
@@ -124,25 +98,14 @@ sub gnu_to_debian {
     }
 
     return undef if !defined($cpu) || !defined($os);
-    if ($os eq "linux") {
-	return $cpu;
-    } else {
-	return "$os-$cpu";
-    }
+    return debian_arch_fix($os, $cpu);
 }
 
-&read_cputable;
-&read_ostable;
-
 # Check for -L
 if (grep { m/^-L$/ } @ARGV) {
     foreach $os (@os) {
 	foreach $cpu (@cpu) {
-	    if ($os eq "linux") {
-		print "$cpu\n"
-	    } else {
-		print "$os-$cpu\n";
-	    }
+	    print debian_arch_fix($os, $cpu)."\n";
 	}
     }
     exit unless $#ARGV;
@@ -182,6 +145,8 @@ if (!defined($deb_host_arch)) {
 $req_host_arch = '';
 $req_host_gnu_type = '';
 $req_build_gnu_type = '';
+$req_eq_arch = '';
+$req_is_arch = '';
 $action='l';
 $force=0;
 
@@ -191,6 +156,12 @@ while (@ARGV) {
 	$req_host_arch = "$'";
     } elsif (m/^-t/) {
 	$req_host_gnu_type = "$'";
+    } elsif (m/^-e/) {
+	$req_eq_arch = "$'";
+	$action = 'e';
+    } elsif (m/^-i/) {
+	$req_is_arch = "$'";
+	$action = 'i';
     } elsif (m/^-[lsu]$/) {
 	$action = $_;
 	$action =~ s/^-//;
@@ -282,6 +253,10 @@ if ($action eq 'l') {
     print "export ".join(" ",@ordered)."\n";
 } elsif ($action eq 'u') {
     print "unset ".join(" ",@ordered)."\n";
+} elsif ($action eq 'e') {
+    exit !debian_arch_eq($deb_host_arch, $req_eq_arch);
+} elsif ($action eq 'i') {
+    exit !debian_arch_is($deb_host_arch, $req_is_arch);
 } elsif ($action eq 'c') {
     @ENV{keys %env} = values %env;
     exec @ARGV;

scripts/dpkg-genchanges.pl

@@ -168,8 +168,9 @@ for $_ (keys %fi) {
     } elsif (s/^C(\d+) //) {
 	$i=$1; $p=$fi{"C$i Package"}; $a=$fi{"C$i Architecture"};
 	if (!defined($p2f{$p}) && not $sourceonly) {
-	    if ($a eq 'any' || ($a eq 'all' && !$archspecific) ||
-		grep($_ eq $substvar{'Arch'}, split(/\s+/, $a))) {
+	    if ((debian_arch_eq('all', $a) && !$archspecific) ||
+		debian_arch_is($arch, $a) ||
+		grep(debian_arch_is($arch, $_), split(/\s+/, $a))) {
 		&warn("package $p in control file but not in files list");
 		next;
 	    }
@@ -191,9 +192,10 @@ for $_ (keys %fi) {
 		$f{$_}= $v;
 	    } elsif (m/^Architecture$/) {
 		if (not $sourceonly) {
-		    if ($v eq 'any' || grep($_ eq $arch, split(/\s+/, $v))) {
+		    if (debian_arch_is($arch, $v) ||
+			grep(debian_arch_is($arch, $_), split(/\s+/, $v))) {
 			$v= $arch;
-		    } elsif ($v ne 'all') {
+		    } elsif (!debian_arch_eq('all', $v)) {
 			$v= '';
 		    }
 		} else {
@@ -318,7 +320,7 @@ $f{'Description'}= "\n ".join("\n ",sort @descriptions);
 
 $f{'Files'}= '';
 for $f (@sourcefiles,@fileslistfiles) {
-    next if ($archspecific && ($p2arch{$f2p{$f}} eq 'all'));
+    next if ($archspecific && debian_arch_eq('all', $p2arch{$f2p{$f}}));
     next if $filedone{$f}++;
     $uf= "$uploadfilesdir/$f";
     open(STDIN,"< $uf") || &syserr("cannot open upload file $uf for reading");

scripts/dpkg-gencontrol.pl

@@ -133,9 +133,9 @@ for $_ (keys %fi) {
         } elsif (m/^Section$|^Priority$/) {
             $spvalue{$_}= $v;
         } elsif (m/^Architecture$/) {
-            if ($v eq 'all') {
+            if (debian_arch_eq('all', $v)) {
                 $f{$_}= $v;
-            } elsif ($v eq 'any') {
+            } elsif (debian_arch_is($arch, $v)) {
                 $f{$_}= $arch;
             } else {
                 @archlist= split(/\s+/,$v);
@@ -144,7 +144,7 @@ for $_ (keys %fi) {
 		      "architecture strings.") if @invalid_archs > 1;
 		&warn("`@invalid_archs' is not a legal ".
 		      "architecture string.") if @invalid_archs == 1;
-                grep($arch eq $_, @archlist) ||
+                grep(debian_arch_is($arch, $_), @archlist) ||
                     &error("current build architecture $arch does not".
                            " appear in package's list (@archlist)");
                 $f{$_}= $arch;
@@ -250,7 +250,8 @@ if (open(X,"< $fileslistfile")) {
     while (<X>) {
         chomp;
         next if m/^([-+0-9a-z.]+)_[^_]+_([\w-]+)\.deb /
-                && ($1 eq $oppackage) && ($2 eq $arch || $2 eq 'all');
+                && ($1 eq $oppackage)
+                && (debian_arch_eq($2, $arch) || debian_arch_eq($2, 'all'));
         print(Y "$_\n") || &syserr("copy old entry to new files list file");
     }
     close(X) || &syserr("close old files list file");

scripts/dpkg-source.pl

@@ -183,9 +183,9 @@ if ($opmode eq 'build') {
             $i=$1; $p=$fi{"C$i Package"};
             push(@binarypackages,$p) unless $packageadded{$p}++;
             if (m/^Architecture$/) {
-                if ($v eq 'any') {
+                if (debian_arch_eq($v, 'any')) {
                     @sourcearch= ('any');
-                } elsif ($v eq 'all') {
+                } elsif (debian_arch_eq($v, 'all')) {
                     if (!@sourcearch || $sourcearch[0] eq 'all') {
                         @sourcearch= ('all');
                     } else {
@@ -195,7 +195,10 @@ if ($opmode eq 'build') {
 		    if (grep($sourcearch[0] eq $_, 'any','all'))  {
 			@sourcearch= ('any');
 		    } else {
-                        for $a (split(/\s+/,$v)) {
+			my @arches = map(debian_arch_expand($_),
+					 split(/\s+/, $v));
+			chomp @arches;
+			for $a (@arches) {
 			    &error("`$a' is not a legal architecture string")
 				unless $a =~ /^[\w-]+$/;
                             &error("architecture $a only allowed on its own".