Bump to Fedora 41

F41 is out let's update COSA to be based on Fedora 41.
coreos · Nov 28, 2024 · 241dd68 · 241dd68
1 parent 9d38a32
commit 241dd68
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 344 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # When rebasing to new Fedora, also update openshift/release:
 # https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml
-FROM quay.io/fedora/fedora:40
+FROM quay.io/fedora/fedora:41
 WORKDIR /root/containerbuild
 
 # Keep this Dockerfile idempotent for local development rebuild use cases.
@@ -18,7 +18,7 @@ COPY ./ /root/containerbuild/
 RUN ./build.sh write_archive_info
 RUN ./build.sh make_and_makeinstall
 RUN ./build.sh configure_user
-RUN ./build.sh patch_osbuild
+# RUN ./build.sh patch_osbuild
 
 # clean up scripts (it will get cached in layers, but oh well)
 WORKDIR /srv/

diff --git a/build.sh b/build.sh
@@ -168,7 +168,7 @@ patch_osbuild() {
     # To make it easier to apply patches we'll move around the osbuild
     # code on the system first:
     rmdir /usr/lib/osbuild/osbuild
-    mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/
+    mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
     mkdir /usr/lib/osbuild/tools
     mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
 
@@ -187,7 +187,7 @@ patch_osbuild() {
     # And then move the files back; supermin appliance creation will need it back
     # in the places delivered by the RPM.
     mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
-    mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild
+    mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
     mkdir /usr/lib/osbuild/osbuild
 }
 
@@ -205,5 +205,5 @@ else
   install_ocp_tools
   trust_redhat_gpg_keys
   configure_user
-  patch_osbuild
+  #patch_osbuild
 fi
diff --git a/src/0001-parsing-add-parse_location_into_parts.patch b/src/0001-parsing-add-parse_location_into_parts.patch
diff --git a/src/0002-parsing-treat-locations-without-scheme-as-belonging-.patch b/src/0002-parsing-treat-locations-without-scheme-as-belonging-.patch
diff --git a/src/0003-org.osbuild.selinux-support-operating-on-mounts.patch b/src/0003-org.osbuild.selinux-support-operating-on-mounts.patch
diff --git a/src/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch b/src/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch
diff --git a/src/cmd-generate-release-meta b/src/cmd-generate-release-meta
@@ -96,10 +96,10 @@ def get_floating_tag(rel, tags):
     for tag in tags:
         if rel not in tag:
             if found != "":
-                raise f"multiple floating tags within: {tags}"
+                raise ValueError(f"multiple floating tags within: {tags}")
             found = tag
     if found == "":
-        raise f"failed to find floating tag within: {tags}"
+        raise ValueError(f"failed to find floating tag within: {tags}")
     return found