From 1fc0eb5fff626793eb989c31caa1972264ee0224 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 27 Feb 2024 12:28:38 +0100 Subject: [PATCH 1/2] sys-kernel/bootengine: Restore support for custom PXE OEM contents This pulls in https://github.com/flatcar/bootengine/pull/88 to restore looking at the documented /usr/share/oem path in a custom PXE OEM initrd instead of /oem. --- changelog/bugfixes/2024-02-27-pxe-oem-initrd.md | 1 + .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2024-02-27-pxe-oem-initrd.md diff --git a/changelog/bugfixes/2024-02-27-pxe-oem-initrd.md b/changelog/bugfixes/2024-02-27-pxe-oem-initrd.md new file mode 100644 index 0000000000..478b415cd6 --- /dev/null +++ b/changelog/bugfixes/2024-02-27-pxe-oem-initrd.md @@ -0,0 +1 @@ +- Restored support for custom OEMs supplied in the PXE boot where `/usr/share/oem` brings the OEM partition contents ([Flatcar#1376](https://github.com/flatcar/Flatcar/issues/1376)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index e9db46d3a5..a96c118ceb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="a85e1977b29dbe8315733dbe1b1ab3ab84d039a2" # flatcar-master + CROS_WORKON_COMMIT="0bade95d3b33b75b6c827d2db2f9298aff0ca05f" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 19dedf06a9237eff1cd21cbd076405e406ae9d51 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 27 Feb 2024 17:55:16 +0100 Subject: [PATCH 2/2] .github: Build PXE image as additional VM image format The PXE image and its helper script is a very handy way to test an image because it does not preserve state. One can boot the same file over and over again without having to reset the image. One can also easily pass in additional kernel cmdline options without having to set up grub.cfg. --- .github/workflows/ci.yaml | 8 +++++--- .github/workflows/pr-comment-build-dispatcher.yaml | 2 +- .github/workflows/pr-workflows.yaml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 57d0d63e25..7345e89f24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: description: | Space-separated vendor formats to build. required: true - default: qemu_uefi + default: qemu_uefi pxe custom_sdk_version: type: string required: false @@ -21,7 +21,7 @@ on: description: | Space-separated vendor formats to build. required: true - default: qemu_uefi + default: qemu_uefi pxe custom_sdk_version: type: string required: false @@ -96,7 +96,7 @@ jobs: arch="${{ matrix.arch }}" echo "arch=${arch}" >> $GITHUB_ENV - IMAGE_FORMATS="qemu_uefi" + IMAGE_FORMATS="qemu_uefi pxe" [ -z "${{ inputs.image_formats }}" ] || IMAGE_FORMATS="${{ inputs.image_formats }}" echo "IMAGE_FORMATS=${IMAGE_FORMATS}" >> $GITHUB_ENV @@ -309,6 +309,8 @@ jobs: scripts/artifacts/images/flatcar_production_*_efi_*.fd scripts/artifacts/images/*.txt scripts/artifacts/images/flatcar_production_*.sh + scripts/artifacts/images/flatcar_production_pxe_image.cpio.gz + scripts/artifacts/images/flatcar_production_pxe.vmlinuz test: needs: packages diff --git a/.github/workflows/pr-comment-build-dispatcher.yaml b/.github/workflows/pr-comment-build-dispatcher.yaml index 4110d351bd..caa80c21d3 100644 --- a/.github/workflows/pr-comment-build-dispatcher.yaml +++ b/.github/workflows/pr-comment-build-dispatcher.yaml @@ -77,4 +77,4 @@ jobs: uses: ./.github/workflows/ci.yaml with: custom_sdk_version: ${{ needs.update_sdk.outputs.sdk_version }} - image_formats: qemu_uefi + image_formats: qemu_uefi pxe diff --git a/.github/workflows/pr-workflows.yaml b/.github/workflows/pr-workflows.yaml index b83f178183..54d799b0db 100644 --- a/.github/workflows/pr-workflows.yaml +++ b/.github/workflows/pr-workflows.yaml @@ -46,4 +46,4 @@ jobs: uses: ./.github/workflows/ci.yaml with: custom_sdk_version: ${{ needs.update_sdk.outputs.sdk_version }} - image_formats: qemu_uefi + image_formats: qemu_uefi pxe