File 0006-Add-architecture-and-scheduler-maps.patch of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Add-architecture-and-scheduler-maps.patch of Package osc (Revision eaa3d9d2fe95e33c874bd14cec55bea5)

Currently displaying revision eaa3d9d2fe95e33c874bd14cec55bea5 , Show latest

From 0000000000000000000000000000000000000000 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] 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 593978491664423875e08c9168a2ab7db32f97dd..f817e472c1e2fac6f9d30356cf7e38f296e0d1c6 100644
--- a/osc/util/packagequery.py
+++ b/osc/util/packagequery.py
@@ -21,6 +21,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().__init__()

Places

File 0006-Add-architecture-and-scheduler-maps.patch of Package osc (Revision eaa3d9d2fe95e33c874bd14cec55bea5)

Places