Skip to content

Commit 10945dc

Browse files
dustymabejlebon
authored andcommitted
osbuild: drop patch for pulling os name from /usr/lib/os-release
The upstream fix [1] has landed in a release [2] so we no longer need this patch. [1] osbuild/osbuild@7593b65 [2] https://github.com/osbuild/osbuild/releases/tag/v157
1 parent 430e872 commit 10945dc

File tree

2 files changed

+9
-39
lines changed

2 files changed

+9
-39
lines changed

build.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,25 +193,25 @@ write_archive_info() {
193193
}
194194

195195
patch_osbuild() {
196+
return # we have no patches right now
196197
## Add a few patches that either haven't made it into a release or
197198
## that will be obsoleted with other work that will be done soon.
198199

199200
## To make it easier to apply patches we'll move around the osbuild
200201
## code on the system first:
201-
rmdir /usr/lib/osbuild/osbuild
202-
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
203-
mkdir /usr/lib/osbuild/tools
204-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
202+
#rmdir /usr/lib/osbuild/osbuild
203+
#mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
204+
#mkdir /usr/lib/osbuild/tools
205+
#mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
205206

206207
## Now all the software is under the /usr/lib/osbuild dir and we can patch
207208
#cat foo.patch | patch -d /usr/lib/osbuild -p1
208-
patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-live-artifacts-read-os-name-from-usr-lib-os-release.patch
209-
209+
#
210210
## And then move the files back; supermin appliance creation will need it back
211211
## in the places delivered by the RPM.
212-
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
213-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
214-
mkdir -p /usr/lib/osbuild/osbuild
212+
#mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
213+
#mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
214+
#mkdir -p /usr/lib/osbuild/osbuild
215215
}
216216

217217
if [ $# -ne 0 ]; then

src/0001-live-artifacts-read-os-name-from-usr-lib-os-release.patch

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

0 commit comments

Comments
 (0)