Skip to content

Commit cef5ef0

Browse files
committed
osbuild: drop /dev/udev osbuild workaround
The underlying cause of this was fixed in bootc 1.15.2 [1] [1] bootc-dev/bootc#2169
1 parent 5a0f8aa commit cef5ef0

2 files changed

Lines changed: 21 additions & 74 deletions

File tree

build.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -182,27 +182,27 @@ write_archive_info() {
182182
}
183183

184184
patch_osbuild() {
185-
#return # No patches at this time
186-
# Add a few patches that either haven't made it into a release or
187-
# that will be obsoleted with other work that will be done soon.
188-
#
189-
# To make it easier to apply patches we'll move around the osbuild
190-
# code on the system first:
191-
rmdir /usr/lib/osbuild/osbuild
192-
python_lib_dir=$(ls -d /usr/lib/python*)
193-
mv "${python_lib_dir}/site-packages/osbuild" /usr/lib/osbuild/
194-
mkdir -p /usr/lib/osbuild/tools
195-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
196-
# Now all the software is under the /usr/lib/osbuild dir and we can patch
197-
# shellcheck disable=SC2002
198-
cat \
199-
/usr/lib/coreos-assembler/0003-buildroot-bind-mount-run-udev-for-partition-discovery.patch \
200-
| patch -d /usr/lib/osbuild -p1
201-
# And then move the files back; supermin appliance creation will need it back
202-
# in the places delivered by the RPM.
203-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
204-
mv /usr/lib/osbuild/osbuild "${python_lib_dir}/site-packages/osbuild"
205-
mkdir -p /usr/lib/osbuild/osbuild
185+
return # No patches at this time
186+
# # Add a few patches that either haven't made it into a release or
187+
# # that will be obsoleted with other work that will be done soon.
188+
# #
189+
# # To make it easier to apply patches we'll move around the osbuild
190+
# # code on the system first:
191+
# rmdir /usr/lib/osbuild/osbuild
192+
# python_lib_dir=$(ls -d /usr/lib/python*)
193+
# mv "${python_lib_dir}/site-packages/osbuild" /usr/lib/osbuild/
194+
# mkdir -p /usr/lib/osbuild/tools
195+
# mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
196+
# # Now all the software is under the /usr/lib/osbuild dir and we can patch
197+
# # shellcheck disable=SC2002
198+
# cat \
199+
# /usr/lib/coreos-assembler/0003-buildroot-bind-mount-run-udev-for-partition-discovery.patch \
200+
# | patch -d /usr/lib/osbuild -p1
201+
# # And then move the files back; supermin appliance creation will need it back
202+
# # in the places delivered by the RPM.
203+
# mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
204+
# mv /usr/lib/osbuild/osbuild "${python_lib_dir}/site-packages/osbuild"
205+
# mkdir -p /usr/lib/osbuild/osbuild
206206
}
207207

208208
fixup_file_permissions() {

src/0003-buildroot-bind-mount-run-udev-for-partition-discovery.patch

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)