[flatpaks/flatpak-runtime] f45: libasan is required by gcc just on aarch64

[flatpaks/flatpak-runtime] f45: libasan is required by gcc just on aarch64

[Tomas Popela]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 4737e749c62b19daf07366444517be9b98ff7ac9
            Author : Tomas Popela <tpopela@redhat.com>
            Date   : 2022-05-17T10:37:57+02:00
            Stats  : +34/-4 in 5 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/4737e749c62b19daf07366444517be9b98ff7ac9?branch=f45

            Log:
            libasan is required by gcc just on aarch64

We have to add a special section for aarch specific packages similar to
one that we have for other architectures. We also have to explicitly add
libasan to package-notes.txt as no package is pulling it in on x86_64
and currently fedmod resolve-deps only resolves on x86_64.

---
diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index e07c939..2d26456 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -18,24 +18,32 @@ data:
     profiles:
         runtime:
             rpms: []
+        runtime-aarch64:
+            rpms: []
         runtime-s390x:
             rpms: []
         runtime-x86_64:
             rpms: []
         runtime-base:
             rpms: []
+        runtime-base-aarch64:
+            rpms: []
         runtime-base-s390x:
             rpms: []
         runtime-base-x86_64:
             rpms: []
         sdk:
             rpms: []
+        sdk-aarch64:
+            rpms: []
         sdk-s390x:
             rpms: []
         sdk-x86_64:
             rpms: []
         sdk-base:
             rpms: []
+        sdk-base-aarch64:
+            rpms: []
         sdk-base-s390x:
             rpms: []
         sdk-base-x86_64:

diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 23fe1fe..e22f6ca 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -607,6 +607,8 @@ data:
       - zlib
       - libzstd
       - zstd
+    runtime-aarch64:
+      rpms: []
     runtime-s390x:
       rpms: []
     runtime-x86_64:
@@ -1166,6 +1168,8 @@ data:
       - zlib
       - libzstd
       - zstd
+    runtime-base-aarch64:
+      rpms: []
     runtime-base-s390x:
       rpms: []
     runtime-base-x86_64:
@@ -2509,6 +2513,9 @@ data:
       - libzstd
       - libzstd-devel
       - zstd
+    sdk-aarch64:
+      rpms:
+      - libasan
     sdk-s390x:
       rpms:
       - glibc-headers-s390
@@ -3781,6 +3788,9 @@ data:
       - libzstd
       - libzstd-devel
       - zstd
+    sdk-base-aarch64:
+      rpms:
+      - libasan
     sdk-base-s390x:
       rpms:
       - glibc-headers-s390

diff --git a/package-notes.txt b/package-notes.txt
index 9bf9f15..ab302af 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -59,6 +59,7 @@ keyutils-libs:
 kmod-libs: FD: pciutils
 libX11-common: W: data files
 libasyncns
+libasan: EB_SDK: required by gcc on aarch64
 libcap-ng: W: libaudit dependency
 libcanberra-gtk3: EB: dropped in upstream GNOME 3.38 runtime, but a large number of Fedora flatpaks still depend on it
 libdb

diff --git a/tools/generate-modulemd.py b/tools/generate-modulemd.py
index ed01237..d57ebd8 100755
--- a/tools/generate-modulemd.py
+++ b/tools/generate-modulemd.py
@@ -19,9 +19,16 @@ 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'] 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']]
+    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'] and
+         p not in ARCH_SPECIFIC_PACKAGES['aarch64']]
+    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']]
+    modulemd['data']['profiles'][profile_name+'-aarch64']['rpms'] = \
+        [p for p in packages if p in ARCH_SPECIFIC_PACKAGES['aarch64']]
 
 if BASEONLY:
     set_profile('runtime', 'out/runtime-base.profile')

diff --git a/tools/util.py b/tools/util.py
index fd01459..27889c2 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -23,9 +23,13 @@ REPOS = [
     "f36--updates",
 ]
 
-# packages that are only available on specific architectures
+# packages that are only available or required on specific architectures
 ARCH_SPECIFIC_PACKAGES = {}
 
+ARCH_SPECIFIC_PACKAGES['aarch64'] = [
+    "libasan",
+]
+
 ARCH_SPECIFIC_PACKAGES['s390x'] = [
     "glibc-headers-s390",
 ]