[flatpaks/flatpak-runtime] f45: glibc-headers-s390 conflicts with glibc-headers-x86

[flatpaks/flatpak-runtime] f45: glibc-headers-s390 conflicts with glibc-headers-x86

[Tomas Popela]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 447d7b0a88a2587d2d538dd44a06724c65d11d0b
            Author : Tomas Popela <tpopela@redhat.com>
            Date   : 2022-05-17T08:29:11+02:00
            Stats  : +24/-3 in 4 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/447d7b0a88a2587d2d538dd44a06724c65d11d0b?branch=f45

            Log:
            glibc-headers-s390 conflicts with glibc-headers-x86

We have to add a special section for s390x specific packages similar to
one that we have for x86_64.

---
diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index 5393322..e07c939 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -18,18 +18,26 @@ data:
     profiles:
         runtime:
             rpms: []
+        runtime-s390x:
+            rpms: []
         runtime-x86_64:
             rpms: []
         runtime-base:
             rpms: []
+        runtime-base-s390x:
+            rpms: []
         runtime-base-x86_64:
             rpms: []
         sdk:
             rpms: []
+        sdk-s390x:
+            rpms: []
         sdk-x86_64:
             rpms: []
         sdk-base:
             rpms: []
+        sdk-base-s390x:
+            rpms: []
         sdk-base-x86_64:
             rpms: []
         buildroot:

diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 84689f5..23fe1fe 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -607,6 +607,8 @@ data:
       - zlib
       - libzstd
       - zstd
+    runtime-s390x:
+      rpms: []
     runtime-x86_64:
       rpms:
       - libquadmath
@@ -1164,6 +1166,8 @@ data:
       - zlib
       - libzstd
       - zstd
+    runtime-base-s390x:
+      rpms: []
     runtime-base-x86_64:
       rpms:
       - libquadmath
@@ -1439,7 +1443,6 @@ data:
       - glibc-common
       - glibc-devel
       - glibc-gconv-extra
-      - glibc-headers-s390
       - glibc-minimal-langpack
       - glibc-nss-devel
       - libnsl
@@ -2506,6 +2509,9 @@ data:
       - libzstd
       - libzstd-devel
       - zstd
+    sdk-s390x:
+      rpms:
+      - glibc-headers-s390
     sdk-x86_64:
       rpms:
       - fftw-libs-quad
@@ -2770,7 +2776,6 @@ data:
       - glibc-common
       - glibc-devel
       - glibc-gconv-extra
-      - glibc-headers-s390
       - glibc-minimal-langpack
       - glibc-nss-devel
       - libnsl
@@ -3776,6 +3781,9 @@ data:
       - libzstd
       - libzstd-devel
       - zstd
+    sdk-base-s390x:
+      rpms:
+      - glibc-headers-s390
     sdk-base-x86_64:
       rpms:
       - fftw-libs-quad

diff --git a/tools/generate-modulemd.py b/tools/generate-modulemd.py
index d94e1ca..ed01237 100755
--- a/tools/generate-modulemd.py
+++ b/tools/generate-modulemd.py
@@ -19,8 +19,9 @@ def set_profile(profile_name, list_file):
     with open(list_file) as f:
         packages = ['flatpak-runtime-config'] + [l.strip() for l in f]
     print("{}: {} packages".format(profile_name, len(packages)), file=sys.stderr)
-    modulemd['data']['profiles'][profile_name]['rpms'] = [p for p in packages if p not in ARCH_SPECIFIC_PACKAGES['x86_64']]
+    modulemd['data']['profiles'][profile_name]['rpms'] = [p for p in packages if p not in ARCH_SPECIFIC_PACKAGES['x86_64'] and p not in ARCH_SPECIFIC_PACKAGES['s390x']]
     modulemd['data']['profiles'][profile_name+'-x86_64']['rpms'] = [p for p in packages if p in ARCH_SPECIFIC_PACKAGES['x86_64']]
+    modulemd['data']['profiles'][profile_name+'-s390x']['rpms'] = [p for p in packages if p in ARCH_SPECIFIC_PACKAGES['s390x']]
 
 if BASEONLY:
     set_profile('runtime', 'out/runtime-base.profile')

diff --git a/tools/util.py b/tools/util.py
index 2613cf4..fd01459 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -26,6 +26,10 @@ REPOS = [
 # packages that are only available on specific architectures
 ARCH_SPECIFIC_PACKAGES = {}
 
+ARCH_SPECIFIC_PACKAGES['s390x'] = [
+    "glibc-headers-s390",
+]
+
 ARCH_SPECIFIC_PACKAGES['x86_64'] = [
     "fftw-libs-quad",
     "glibc-headers-x86",