Skip to content

Commit b68a37f

Browse files
nikita-dubrovskiidustymabe
authored andcommitted
Drop osbuild patches for platform and selinux stages
- 'stages/coreos.platform: use shutil.copy' - 'stages/selinux: don't require file_contexts if labels passed' Both are merged and come with osbuild-130.rpm (cherry picked from commit 7f06c1d)
1 parent 1848412 commit b68a37f

File tree

3 files changed

+1
-100
lines changed

3 files changed

+1
-100
lines changed

build.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,7 @@ patch_osbuild() {
173173
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
174174

175175
# Now all the software is under the /usr/lib/osbuild dir and we can patch
176-
cat /usr/lib/coreos-assembler/0001-stages-coreos.platform-use-shutil.copy.patch \
177-
/usr/lib/coreos-assembler/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch \
178-
/usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch \
179-
| patch -d /usr/lib/osbuild -p1
176+
patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch
180177

181178
# And then move the files back; supermin appliance creation will need it back
182179
# in the places delivered by the RPM.

src/0001-stages-coreos.platform-use-shutil.copy.patch

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

src/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch

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

0 commit comments

Comments
 (0)