[pacman-dev] [PATCH] Add support for multiple 'Architecture' values

Dan McGee dpmcgee at gmail.com
Wed Apr 21 14:06:57 UTC 2021


On Wed, Apr 21, 2021 at 8:25 AM Allan McRae <allan at archlinux.org> wrote:
>
> From: Dan McGee <dan at archlinux.org>
>
> This allows architecture to be multivalued. On x86-64 machines, this
> could be something like:
>     Architecture = x86-64-v3 x86-64
>
> We use the first specified Architecture value in mirrorlist $arch
> variable replacement, as this is backwards-compatible and sane.
>
> Original-patch-by: Dan McGee <dan at archlinux.org>
> Patch-updated-by: Allan McRae <allan at archlinux.org>
> Signed-off-by: Allan McRae <allan at archlinux.org>
> ---
>
> Here is the link to Dan's original patch from 2012!
> https://code.toofishes.net/cgit/dan/pacman.git/commit/?h=multiarch&id=673c7d08c30fc897f534bda24e88e806e27bea2b
>
> Getting this patch to apply did not require much effort, so I left
> Dan as the author. We guess the original patch did not get applied
> because it got lost due to no-one pushing it for inclusion.
>
>  doc/pacman.conf.5.asciidoc                    | 10 +++---
>  lib/libalpm/alpm.h                            | 30 ++++++++++++-----
>  lib/libalpm/handle.c                          | 30 +++++++++++++----
>  lib/libalpm/handle.h                          |  2 +-
>  lib/libalpm/trans.c                           | 21 ++++++++++--
>  src/pacman/conf.c                             | 33 ++++++++++++-------
>  src/pacman/conf.h                             |  4 +--
>  src/pacman/pacman-conf.c                      |  4 +--
>  src/pacman/pacman.c                           |  2 +-
>  test/pacman/meson.build                       |  2 ++
>  test/pacman/tests/multiple-architectires01.py | 14 ++++++++
>  test/pacman/tests/multiple-architectires02.py | 16 +++++++++
You have a misspelling here- s/architectires/architectures/ in these
filenames, as well as the `meson.build` file.
>  12 files changed, 127 insertions(+), 41 deletions(-)
>  create mode 100644 test/pacman/tests/multiple-architectires01.py
>  create mode 100644 test/pacman/tests/multiple-architectires02.py


More information about the pacman-dev mailing list