Skip to content

Commit

Permalink
build.sh: drop patch_osbuild()
Browse files Browse the repository at this point in the history
Let's drop this since we are no longer patching. We can pull
it from git history if we need it again.
  • Loading branch information
dustymabe authored and jlebon committed May 22, 2024
1 parent cfb6d37 commit 5f83720
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 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

# clean up scripts (it will get cached in layers, but oh well)
WORKDIR /srv/
Expand Down
24 changes: 0 additions & 24 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ if [ $# -gt 1 ]; then
echo " configure_yum_repos"
echo " install_rpms"
echo " make_and_makeinstall"
echo " patch_osbuild"
exit 1
fi

Expand Down Expand Up @@ -161,28 +160,6 @@ write_archive_info() {
prepare_git_artifacts "${srcdir}" /cosa/coreos-assembler-git.json /cosa/coreos-assembler-git.tar.gz
}

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 your.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
# Run the function specified by the calling script
${1}
Expand All @@ -197,5 +174,4 @@ else
install_ocp_tools
trust_redhat_gpg_keys
configure_user
patch_osbuild
fi

0 comments on commit 5f83720

Please sign in to comment.