Bladeren bron

man: Document multiarch triplet in dpkg-architecture(1) TERMS section

Also make it a bit more clear by changing the “GNU system type” example
to use something else than i386, which is the only current difference
between these terms.
Guillem Jover 11 jaren geleden
bovenliggende
commit
6b16edc08b
2 gewijzigde bestanden met toevoegingen van 11 en 2 verwijderingen
  1. 1 0
      debian/changelog
  2. 10 2
      man/dpkg-architecture.1

+ 1 - 0
debian/changelog

@@ -13,6 +13,7 @@ dpkg (1.18.2) UNRELEASED; urgency=low
     - Document abitable in dpkg-architecture(1).
     - Document abitable in dpkg-architecture(1).
     - Clarify that an architecture wildcard is a Debian thing in
     - Clarify that an architecture wildcard is a Debian thing in
       dpkg-architecture(1).
       dpkg-architecture(1).
+    - Document multiarch triplet in dpkg-architecture(1) TERMS section.
 
 
   [ Updated programs translations ]
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #789097
   * Dutch (Frans Spiesschaert). Closes: #789097

+ 10 - 2
man/dpkg-architecture.1

@@ -145,8 +145,16 @@ any real architecture being part of it. The general form is <kernel>\-<cpu>.
 Examples: linux\-any, any\-i386, hurd\-any.
 Examples: linux\-any, any\-i386, hurd\-any.
 .IP "GNU system type" 4
 .IP "GNU system type" 4
 An architecture specification string consisting of two parts separated by
 An architecture specification string consisting of two parts separated by
-a hyphen: cpu and system. Examples: i386\-linux\-gnu, sparc\-linux\-gnu,
-i386\-gnu, x86_64\-netbsd.
+a hyphen: cpu and system.
+Examples: i586\-linux\-gnu, sparc\-linux\-gnu, i686\-gnu, x86_64\-netbsd.
+.IP "multiarch triplet" 4
+The clarified GNU system type, used for filesystem paths.
+This triplet does not change even when the baseline ISA gets bumped,
+so that the resulting paths are stable over time.
+The only current difference with the GNU system type is that the CPU part
+for i386 based systems is always i386.
+Examples: i386\-linux\-gnu, x86_64\-linux\-gnu.
+Example paths: /lib/powerpc64le-linux-gnu/, /usr/lib/i386-kfreebsd-gnu/.
 .
 .
 .SH VARIABLES
 .SH VARIABLES
 The following variables are set by \fBdpkg\-architecture\fP:
 The following variables are set by \fBdpkg\-architecture\fP: