Skip to content

[rhcos-4.17] support cosa buildextend-qemu-secex #3929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dustymabe merged 3 commits into from
Nov 11, 2024
Merged

[rhcos-4.17] support cosa buildextend-qemu-secex #3929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9918818
Revert "Add osbuild patch for org.osbuild.dmverity stage fix"
nikita-dubrovskii Sep 19, 2024
850dcfa
Drop osbuild patches for platform and selinux stages
nikita-dubrovskii Sep 19, 2024
86386eb
support `cosa buildextend-qemu-secex`
dustymabe Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,7 @@ patch_osbuild() {
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 /usr/lib/coreos-assembler/0001-stages-dmverity-make-device-objects-more-generic.patch \
/usr/lib/coreos-assembler/0001-stages-coreos.platform-use-shutil.copy.patch \
/usr/lib/coreos-assembler/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch \
/usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch \
| patch -d /usr/lib/osbuild -p1
patch -d /usr/lib/osbuild -p1 < /usr/lib/coreos-assembler/0001-hacks-for-coreos-selinux-issues.patch

# And then move the files back; supermin appliance creation will need it back
# in the places delivered by the RPM.
Expand Down
31 changes: 0 additions & 31 deletions src/0001-stages-coreos.platform-use-shutil.copy.patch
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions src/0001-stages-dmverity-make-device-objects-more-generic.patch
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions src/0001-stages-selinux-don-t-require-file_contexts-if-labels.patch
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions src/cmd-buildextend-metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ case "$(basename "$0")" in
image_type=qemu
image_suffix=-secex
;;
"cmd-buildextend-qemu-secex")
secure_execution=1
image_type=qemu
image_suffix=-secex
;;
*) fatal "called as unexpected name $0";;
esac

Expand Down
1 change: 1 addition & 0 deletions src/cmd-buildextend-qemu-secex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./cmd-buildextend-metal
Loading