From 9d62eef571ffd1fd2df8b97884d3689fced27fb1 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 7 Jan 2025 17:39:32 +0100
Subject: Implement architecture variants

Architecture variants are children of an architecture that share
the same ABI but are optimized for different ISA levels. They
are available in Ubuntu 25.10 and newer, and not supported in
Debian or other distributions.

A deb built for a variant contains the Architecture-Variant field,
and the Architecture field points to the baseline, for example:

    Architecture: amd64
    Architecture-Variant: amd64v3

However, the apt-get indextargets command reports the variant in the
Architecture: field, and most of the code in APT presents the variant
as the architecture.

There are two types of variants:

1. Standalone variants are recorded in the Architectures field of the
   Release file as if they were a real architecture:

        Architectures: amd64 amd64v3

   Standalone architecture variants only fetch the standalone
   architecture variant's Packages file. To do this, this patch
   changes the code such that the variants indextargets "supplant"
   the base targets.

   This may have complicated outcomes on the apt-get indextargets
   command.

2. Other variants can only be identified by their files being recorded
   with hashes in the Release file.

   APT fetches both the base architecture's as well as the variant's
   Packages file.

Variants are configured in the

    APT::Architecture-Variants

list.

Image builders may want to build specific variant images using

    APT::Architecture-Variants { "amd64v3"; }

But this commit also implements an automatic discovery mechanism
using the varianttable and /proc/cpuinfo.

    APT::Architecture-Variants "auto";
---
 doc/examples/configure-index | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 1b050d0b9..f08026136 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -51,6 +51,7 @@ APT
   Audit "<BOOL>"; // display audit messages
   Architecture "<STRING>"; // debian architecture like amd64, i386, powerpc, armhf, mips, …
   Architectures "<LIST>"; // a list of (foreign) debian architectures, defaults to: dpkg --print-foreign-architectures
+  Architecture-Variants "<STRING_OR_LIST>"; // a list of variants or the string auto
   BarbarianArchitectures "<LIST>"; // a list of architectures considered too foreign to satisfy M-A:foreign
 
   Build-Essential "<LIST>"; // list of package names
@@ -468,6 +469,9 @@ Dir "<DIR>"
   Boot "<DIR>";
   Usr "<DIR>";
   Apport "<DIR>";
+  Proc "<DIR"> {
+    CpuInfo "<FILE>";
+  };
 };
 
 // Things that effect the APT dselect method
@@ -567,6 +571,7 @@ Debug
   Acquire::Transaction "<BOOL>";
   Acquire::Progress "<BOOL>";
   Acquire::Retries "<BOOL>";    // Debugging for retries, especially delays
+  Acquire::Variants "<BOOL>";    // Debugging for architecture variants
   aptcdrom "<BOOL>";        // Show found package files
   IdentCdrom "<BOOL>";
   acquire::netrc "<BOOL>";  // netrc parser
@@ -900,6 +905,7 @@ dir::filelistdir "<STRING>";
 dir::dpkg::tupletable "<FILE>";
 dir::dpkg::triplettable "<FILE>";
 dir::dpkg::cputable "<FILE>";
+dir::dpkg::varianttable "<FILE>";
 Rred::t "<BOOL>";
 Rred::f "<BOOL>";
 Rred::Compress "<STRING>";
-- 
cgit v1.2.3-70-g09d2