public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Split x86_64 specific packages out to <profile>-<arch> in modulemd files
Date: Fri, 11 Sep 2026 14:41:51 GMT [thread overview]
Message-ID: <178913771185.1.17818736692163752412.flatpaks-flatpak-runtime-6e69b2564d2f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : 6e69b2564d2f8c48af351a255e32c7ea60579e56
Author : Kalev Lember <klember@redhat.com>
Date : 2021-10-18T18:32:44+02:00
Stats : +57/-22 in 5 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/6e69b2564d2f8c48af351a255e32c7ea60579e56?branch=f45
Log:
Split x86_64 specific packages out to <profile>-<arch> in modulemd files
This should hopefully allow building the runtime on aarch64 where not
all of the packages are available.
---
diff --git a/flatpak-runtime-baseonly.in.yaml b/flatpak-runtime-baseonly.in.yaml
index f13df02..2528c49 100644
--- a/flatpak-runtime-baseonly.in.yaml
+++ b/flatpak-runtime-baseonly.in.yaml
@@ -15,8 +15,12 @@ data:
profiles:
runtime:
rpms: []
+ runtime-x86_64:
+ rpms: []
sdk:
rpms: []
+ sdk-x86_64:
+ rpms: []
buildroot:
rpms: [flatpak-rpm-macros, flatpak-runtime-config]
srpm-buildroot:
diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index 77ffee8..5393322 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -18,12 +18,20 @@ data:
profiles:
runtime:
rpms: []
+ runtime-x86_64:
+ rpms: []
runtime-base:
rpms: []
+ runtime-base-x86_64:
+ rpms: []
sdk:
rpms: []
+ sdk-x86_64:
+ rpms: []
sdk-base:
rpms: []
+ sdk-base-x86_64:
+ rpms: []
buildroot:
rpms: [flatpak-rpm-macros, flatpak-runtime-config]
srpm-buildroot:
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index bd2ed6f..b05ec30 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -115,7 +115,6 @@ data:
- libitm
- liblsan
- libobjc
- - libquadmath
- libstdc++
- libtsan
- libubsan
@@ -502,7 +501,6 @@ data:
- util-linux-core
- libdvbv5
- libv4l
- - libvmaf
- vulkan-loader
- vulkan-validation-layers
- wavpack
@@ -539,6 +537,10 @@ data:
- zlib
- libzstd
- zstd
+ runtime-x86_64:
+ rpms:
+ - libquadmath
+ - libvmaf
runtime-base:
rpms:
- flatpak-runtime-config
@@ -630,7 +632,6 @@ data:
- libitm
- liblsan
- libobjc
- - libquadmath
- libstdc++
- libtsan
- libubsan
@@ -995,7 +996,6 @@ data:
- util-linux-core
- libdvbv5
- libv4l
- - libvmaf
- vulkan-loader
- vulkan-validation-layers
- wavpack
@@ -1026,6 +1026,10 @@ data:
- zlib
- libzstd
- zstd
+ runtime-base-x86_64:
+ rpms:
+ - libquadmath
+ - libvmaf
sdk:
rpms:
- flatpak-runtime-config
@@ -1184,7 +1188,6 @@ data:
- fftw-libs
- fftw-libs-double
- fftw-libs-long
- - fftw-libs-quad
- fftw-libs-single
- file
- file-devel
@@ -1229,8 +1232,6 @@ data:
- libitm
- liblsan
- libobjc
- - libquadmath
- - libquadmath-devel
- libstdc++
- libstdc++-devel
- libtsan
@@ -1274,7 +1275,6 @@ data:
- glibc-common
- glibc-devel
- glibc-gconv-extra
- - glibc-headers-x86
- glibc-minimal-langpack
- glibc-nss-devel
- libnsl
@@ -1535,7 +1535,6 @@ data:
- libimagequant
- libinput
- libinput-devel
- - libipt
- libjpeg-turbo
- libjpeg-turbo-devel
- libjpeg-turbo-utils
@@ -2178,7 +2177,6 @@ data:
- strace
- subunit
- subunit-devel
- - svt-av1-libs
- sysprof-capture-devel
- systemd
- systemd-devel
@@ -2231,8 +2229,6 @@ data:
- valgrind-tools-devel
- vim-filesystem
- vim-minimal
- - libvmaf
- - libvmaf-devel
- vulkan-headers
- vulkan-loader
- vulkan-loader-devel
@@ -2299,6 +2295,16 @@ data:
- libzstd
- libzstd-devel
- zstd
+ sdk-x86_64:
+ rpms:
+ - fftw-libs-quad
+ - libquadmath
+ - libquadmath-devel
+ - glibc-headers-x86
+ - libipt
+ - svt-av1-libs
+ - libvmaf
+ - libvmaf-devel
sdk-base:
rpms:
- flatpak-runtime-config
@@ -2443,7 +2449,6 @@ data:
- fftw-libs
- fftw-libs-double
- fftw-libs-long
- - fftw-libs-quad
- fftw-libs-single
- file
- file-devel
@@ -2488,8 +2493,6 @@ data:
- libitm
- liblsan
- libobjc
- - libquadmath
- - libquadmath-devel
- libstdc++
- libstdc++-devel
- libtsan
@@ -2527,7 +2530,6 @@ data:
- glibc-common
- glibc-devel
- glibc-gconv-extra
- - glibc-headers-x86
- glibc-minimal-langpack
- glibc-nss-devel
- libnsl
@@ -2772,7 +2774,6 @@ data:
- libijs
- libimagequant
- libinput
- - libipt
- libjpeg-turbo
- libjpeg-turbo-devel
- libjpeg-turbo-utils
@@ -3397,7 +3398,6 @@ data:
- strace
- subunit
- subunit-devel
- - svt-av1-libs
- sysprof-capture-devel
- systemd
- systemd-devel
@@ -3446,8 +3446,6 @@ data:
- valgrind-tools-devel
- vim-filesystem
- vim-minimal
- - libvmaf
- - libvmaf-devel
- vulkan-headers
- vulkan-loader
- vulkan-loader-devel
@@ -3501,6 +3499,16 @@ data:
- libzstd
- libzstd-devel
- zstd
+ sdk-base-x86_64:
+ rpms:
+ - fftw-libs-quad
+ - libquadmath
+ - libquadmath-devel
+ - glibc-headers-x86
+ - libipt
+ - svt-av1-libs
+ - libvmaf
+ - libvmaf-devel
buildroot:
rpms:
- flatpak-rpm-macros
diff --git a/tools/generate-modulemd.py b/tools/generate-modulemd.py
index 85e80b7..d94e1ca 100755
--- a/tools/generate-modulemd.py
+++ b/tools/generate-modulemd.py
@@ -1,7 +1,7 @@
#!/usr/bin/python3
import sys
from yaml_utils import ordered_load, ordered_dump
-from util import ID_PREFIX, STREAM, RPM_BRANCH, BASEONLY
+from util import ID_PREFIX, STREAM, RPM_BRANCH, BASEONLY, ARCH_SPECIFIC_PACKAGES
template = 'flatpak-runtime-baseonly.in.yaml' if BASEONLY else 'flatpak-runtime.in.yaml'
@@ -19,7 +19,8 @@ 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'] = packages
+ 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+'-x86_64']['rpms'] = [p for p in packages if p in ARCH_SPECIFIC_PACKAGES['x86_64']]
if BASEONLY:
set_profile('runtime', 'out/runtime-base.profile')
diff --git a/tools/util.py b/tools/util.py
index d1c7cc8..4f93a3b 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -22,6 +22,20 @@ REPOS = [
"f35--fedora",
]
+# packages that are only available on specific architectures
+ARCH_SPECIFIC_PACKAGES = {}
+
+ARCH_SPECIFIC_PACKAGES['x86_64'] = [
+ "fftw-libs-quad",
+ "glibc-headers-x86",
+ "libipt",
+ "libquadmath",
+ "libquadmath-devel",
+ "libvmaf",
+ "libvmaf-devel",
+ "svt-av1-libs",
+]
+
_log_name = None
def set_log_name(name):
reply other threads:[~2026-09-11 14:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178913771185.1.17818736692163752412.flatpaks-flatpak-runtime-6e69b2564d2f@fedoraproject.org \
--to=klember@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox