summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2016-01-29 11:13:12 +0100
committerGuillem Jover <guillem@debian.org>2016-10-31 03:49:10 +0100
commit16847ec012a11435bec3872593ba3c7e5b9ff492 (patch)
tree368814d8e6364332e0bfd47b248f8ecc49b2ae05
parent86a6018a6bd90ad091e9879145381003b1dd317b (diff)
downloaddpkg-16847ec012a11435bec3872593ba3c7e5b9ff492.tar.gz
arch: Add a version pseudo-field to the arch tables
This should allow external parsers to know if they can understand the table contents.
-rw-r--r--data/abitable2
-rw-r--r--data/cputable2
-rw-r--r--data/ostable2
-rw-r--r--data/triplettable2
-rw-r--r--debian/changelog1
-rw-r--r--man/dpkg-architecture.man7
6 files changed, 16 insertions, 0 deletions
diff --git a/data/abitable b/data/abitable
index 0631a8ca7..134dfe836 100644
--- a/data/abitable
+++ b/data/abitable
@@ -1,3 +1,5 @@
+# Version=1.0
+#
# This file contains the table of arch ABI attribute overrides.
#
# If the ABI is not present here then the attribute information for a
diff --git a/data/cputable b/data/cputable
index e2f3f2d19..a066b0f2b 100644
--- a/data/cputable
+++ b/data/cputable
@@ -1,3 +1,5 @@
+# Version=1.0
+#
# This file contains the table of known CPU names.
#
# Architecture names are formed as a combination of the system name
diff --git a/data/ostable b/data/ostable
index 00d744708..70cb663b8 100644
--- a/data/ostable
+++ b/data/ostable
@@ -1,3 +1,5 @@
+# Version=1.0
+#
# This file contains the table of known operating system names.
#
# Architecture names are formed as a combination of the system name
diff --git a/data/triplettable b/data/triplettable
index 216d719a5..3736ac0e2 100644
--- a/data/triplettable
+++ b/data/triplettable
@@ -1,3 +1,5 @@
+# Version=1.0
+#
# Bidirectional mapping between a Debian triplet and a Debian arch.
#
# Supported variables: <cpu>
diff --git a/debian/changelog b/debian/changelog
index f9458025a..41e22a2a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
* Give more information on --set-selections warnings. Closes: #842230
* Architecture support:
- Add support for AIX operating system.
+ - Add a version pseudo-field to the arch tables.
* Portability:
- Cast off_t variables to intmax_t when printing them with "%jd".
- Add missing <string.h> include in libdpkg.
diff --git a/man/dpkg-architecture.man b/man/dpkg-architecture.man
index 87eab43dd..0d3ced2f7 100644
--- a/man/dpkg-architecture.man
+++ b/man/dpkg-architecture.man
@@ -222,19 +222,26 @@ paths (since dpkg 1.17.14).
All these files have to be present for \fBdpkg\-architecture\fP to
work. Their location can be overridden at runtime with the environment
variable \fBDPKG_DATADIR\fP.
+These tables contain a format \fBVersion\fP pseudo-field on their first
+line to mark their format, so that parsers can check if they understand
+it, such as "# Version=1.0".
.TP
.I %PKGDATADIR%/cputable
Table of known CPU names and mapping to their GNU name.
+Format version 1.0 (since dpkg 1.13.2).
.TP
.I %PKGDATADIR%/ostable
Table of known operating system names and mapping to their GNU name.
+Format version 1.0 (since dpkg 1.13.2).
.TP
.I %PKGDATADIR%/triplettable
Mapping between Debian architecture triplets and Debian architecture
names.
+Format version 1.0 (since dpkg 1.14.0).
.TP
.I %PKGDATADIR%/abitable
Table of Debian architecture ABI attribute overrides.
+Format version 1.0 (since dpkg 1.16.3).
.SS Packaging support
.TP
.I %PKGDATADIR%/architecture.mk