diff options
author | Björn Bidar | 2021-12-25 01:47:36 +0200 |
---|---|---|
committer | Björn Bidar | 2022-01-09 02:41:19 +0200 |
commit | e5f15edab3c87b91f4397dc367dc442ae5df800d (patch) | |
tree | 96a146b4f2129b31d29183fbbee9101d52633a10 /0006-Add-architecture-and-scheduler-maps.patch | |
parent | e77c9e2e518fdc637ccba818c0689c537ad41f47 (diff) | |
download | aur-e5f15edab3c87b91f4397dc367dc442ae5df800d.tar.gz |
Update 0.175.0
- New upstream release
- Add patches that implement copyprj and prjconf
Diffstat (limited to '0006-Add-architecture-and-scheduler-maps.patch')
-rw-r--r-- | 0006-Add-architecture-and-scheduler-maps.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/0006-Add-architecture-and-scheduler-maps.patch b/0006-Add-architecture-and-scheduler-maps.patch new file mode 100644 index 000000000000..6fd95835b5d0 --- /dev/null +++ b/0006-Add-architecture-and-scheduler-maps.patch @@ -0,0 +1,32 @@ +From a92e36fd28ef36715346b133d13434d700efaca5 Mon Sep 17 00:00:00 2001 +From: Marko Lemmetty <marko.lemmetty@jollamobile.com> +Date: Fri, 15 May 2020 15:16:37 +0300 +Subject: [PATCH 6/7] Add architecture and scheduler maps + +Makes preferring local packages with armv8el and i486 OBS schedulers +work. These mappings armv7hl/armv7tnhl -> armv8el and i486 -> +i586/i686 only affect the "get-preferred-packages" evaluation that is +used when the -p or --prefer-pkgs option is used with the osc build +command. +--- + osc/util/packagequery.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/osc/util/packagequery.py b/osc/util/packagequery.py +index 93a439b5..c3aa2c0d 100644 +--- a/osc/util/packagequery.py ++++ b/osc/util/packagequery.py +@@ -18,6 +18,10 @@ class PackageQueries(dict): + # map debian and rpm arches to common obs arches + architectureMap = {'i386': ['i586', 'i686'], 'amd64': ['x86_64'], 'ppc64el': ['ppc64le'], 'armv6hl': ['armv6l'], 'armv7hl': ['armv7l']} + ++ # map rpm arches to mer obs scheduler arches ++ architectureMap.update({'armv7hl': ['armv8el'], 'armv7tnhl': ['armv8el'], ++ 'i486': ['i586', 'i686']}) ++ + def __init__(self, wanted_architecture): + self.wanted_architecture = wanted_architecture + super(PackageQueries, self).__init__() +-- +2.34.1 + |