From 7f714ff47471e5d07284a69c4af5309f40f0ea09 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 31 May 2010 11:38:49 -0700 Subject: [PATCH] Further architecture wildcard wording clarifications Call out "all" specifically in more places and fix some grammatical and wording issues from multiple editings. --- policy.sgml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/policy.sgml b/policy.sgml index ebf8d66..4620b2e 100644 --- a/policy.sgml +++ b/policy.sgml @@ -2747,8 +2747,8 @@ Package: libc6

In the main debian/control file in the source - package, this field may contain special value all or - a list of specific and wildcard architectures separated by + package, this field may contain the special value all + or a list of specific and wildcard architectures separated by spaces. If all appears, that value must be the entire contents of the field. Most packages will use either any or all. Specifying a specific @@ -2803,14 +2803,13 @@ Package: libc6 of each specified architecture wildcard, and will only work correctly on the architectures in the union of the lists. - As mentioned in the footnote for specifying a list of - architectures, this is for a minority of cases where the - program is not portable. It should not be used for most - packages. Wildcards are not expanded into a list of known - architectures before comparing to the build architecutre. - Instead, the build architecture is matched against any - wildcards and this package is built if any wildcard - matches. + Use of architecture wildcards other than all is for + a minority of cases where the program is not portable and + should not be used for most packages. Wildcards are not + expanded into a list of known architectures before comparing + to the build architecutre. Instead, the build architecture + is matched against any wildcards and this package is built + if any wildcard matches. If the source package also builds at least one architecture-independent package, all will also be @@ -4300,10 +4299,10 @@ Build-Depends: foo [!i386] | bar [!amd64] Build-Depends: foo [linux-any], bar [any-i386], baz [!linux-any] - is equivalent to foo on architectures using the - Linux kernel and any cpu, bar on architectures - using any kernel and an i386 cpu, and baz on - on any architecture using a kernel other than Linux. + is equivalent to foo on architectures using the Linux + kernel and any cpu, bar on architectures using any + kernel and an i386 cpu, and baz on any architecture + using a kernel other than Linux.

@@ -8006,15 +8005,16 @@ done Architecture Wildcards

- A package may specify an architecture wildcard. Architecture - wildcards are in the format os-any and - any-cpu. + A package may specify an architecture wildcard. Architecture + wildcards are in the format any (which matches every + architecture), os-any, or + any-cpu. Internally, the package system normalizes the GNU triplets and the Debian arches into Debian arch triplets (which are kind of inverted GNU triplets), with the first component of the - triplet representing the libc in use. When matching two - Debian arch triplets, whenever an any is found it - matches with anything on the other side, like in: + triplet representing the libc and ABI in use. When matching + two Debian arch triplets, whenever an any is found + it matches with anything on the other side, like in: gnu-linux-i386 is matched by gnu-linux-any gnu-kfreebsd-amd64 is matched by any-any-amd64 -- 2.39.5