Skip to content

Commit

Permalink
build.sh: drop osbuild patches
Browse files Browse the repository at this point in the history
All of these patches should be in the latest OSBuild RPMs in
Fedora 40 so we should be good to drop these.
  • Loading branch information
dustymabe committed Jan 31, 2025
1 parent dd6edc8 commit 1edb5c3
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,28 +162,28 @@ write_archive_info() {
}

patch_osbuild() {
# Add a few patches that either haven't made it into a release or
# that will be obsoleted with other work that will be done soon.

# 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/
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 \
| patch -d /usr/lib/osbuild -p1

# 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
mkdir /usr/lib/osbuild/osbuild
return # we have no patches right now

## Add a few patches that either haven't made it into a release or
## that will be obsoleted with other work that will be done soon.

## 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/
#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 patch1.patch \
# patch2.patch \
# | patch -d /usr/lib/osbuild -p1

## 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
#mkdir /usr/lib/osbuild/osbuild
}

if [ $# -ne 0 ]; then
Expand Down

0 comments on commit 1edb5c3

Please sign in to comment.