Skip to content

Commit

Permalink
Bump to Fedora 41
Browse files Browse the repository at this point in the history
F41 is out let's update COSA to be based on Fedora 41.
  • Loading branch information
gursewak1997 committed Nov 28, 2024
1 parent 9d38a32 commit 943fb06
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 347 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
10 changes: 3 additions & 7 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,12 @@ 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/

# Now all the software is under the /usr/lib/osbuild dir and we can patch
cat /usr/lib/coreos-assembler/0001-parsing-add-parse_location_into_parts.patch \
/usr/lib/coreos-assembler/0002-parsing-treat-locations-without-scheme-as-belonging-.patch \
/usr/lib/coreos-assembler/0003-org.osbuild.selinux-support-operating-on-mounts.patch \
/usr/lib/coreos-assembler/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch \
/usr/lib/coreos-assembler/0001-osbuild-remoteloop-add-more-loop-device-options.patch \
cat /usr/lib/coreos-assembler/0001-osbuild-remoteloop-add-more-loop-device-options.patch \
/usr/lib/coreos-assembler/0002-osbuild-loop-make-the-loop-device-if-missing.patch \
/usr/lib/coreos-assembler/0003-util-osrelease.py-improve-whitespace-and-quote-strip.patch \
/usr/lib/coreos-assembler/0004-util-chroot-Add-support-for-custom-directory-bind-mo.patch \
Expand All @@ -187,7 +183,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
}

Expand Down
68 changes: 0 additions & 68 deletions src/0001-parsing-add-parse_location_into_parts.patch

This file was deleted.

This file was deleted.

116 changes: 0 additions & 116 deletions src/0003-org.osbuild.selinux-support-operating-on-mounts.patch

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/cmd-generate-release-meta
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Loading

0 comments on commit 943fb06

Please sign in to comment.