@@ -193,27 +193,27 @@ write_archive_info() {
193193}
194194
195195patch_osbuild () {
196- return # No patches at this time
197- # ## Add a few patches that either haven't made it into a release or
198- # ## that will be obsoleted with other work that will be done soon.
199- # ##
200- # ## To make it easier to apply patches we'll move around the osbuild
201- # ## code on the system first:
202- # # rmdir /usr/lib/osbuild/osbuild
203- # # python_lib_dir=$(ls -d /usr/lib/python*)
204- # # mv "${python_lib_dir}/site-packages/osbuild" /usr/lib/osbuild/
205- # # mkdir -p /usr/lib/osbuild/tools
206- # # mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
207- # ## Now all the software is under the /usr/lib/osbuild dir and we can patch
208- # ## shellcheck disable=SC2002
209- # # cat \
210- # # /usr/lib/coreos-assembler/foo .patch \
211- # # | patch -d /usr/lib/osbuild -p1
212- # ## And then move the files back; supermin appliance creation will need it back
213- # ## in the places delivered by the RPM.
214- # # mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
215- # # mv /usr/lib/osbuild/osbuild "${python_lib_dir}/site-packages/osbuild"
216- # # mkdir -p /usr/lib/osbuild/osbuild
196+ # return # No patches at this time
197+ # Add a few patches that either haven't made it into a release or
198+ # that will be obsoleted with other work that will be done soon.
199+ #
200+ # To make it easier to apply patches we'll move around the osbuild
201+ # code on the system first:
202+ rmdir /usr/lib/osbuild/osbuild
203+ python_lib_dir=$( ls -d /usr/lib/python* )
204+ mv " ${python_lib_dir} /site-packages/osbuild" /usr/lib/osbuild/
205+ mkdir -p /usr/lib/osbuild/tools
206+ mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
207+ # Now all the software is under the /usr/lib/osbuild dir and we can patch
208+ # shellcheck disable=SC2002
209+ cat \
210+ /usr/lib/coreos-assembler/0001-bootc-install-to-fs-hardcode-enforce-container-sigpo .patch \
211+ | patch -d /usr/lib/osbuild -p1
212+ # And then move the files back; supermin appliance creation will need it back
213+ # in the places delivered by the RPM.
214+ mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
215+ mv /usr/lib/osbuild/osbuild " ${python_lib_dir} /site-packages/osbuild"
216+ mkdir -p /usr/lib/osbuild/osbuild
217217}
218218
219219fixup_file_permissions () {
0 commit comments