Merge pull request #1441 from flatcar/tormath1/gcp-oem

oem: port GCE to sysext image

Author: tormath1

build_library/vm_image_util.sh

@@ -256,8 +256,9 @@ IMG_iso_MEM=2048
 ## gce, image tarball
 IMG_gce_DISK_LAYOUT=vm
 IMG_gce_CONF_FORMAT=gce
-IMG_gce_OEM_PACKAGE=oem-gce
-IMG_gce_OEM_ACI=gce
+IMG_gce_OEM_PACKAGE=common-oem-files
+IMG_gce_OEM_USE=gce
+IMG_gce_OEM_SYSEXT=oem-gce
 
 ## rackspace
 IMG_rackspace_OEM_PACKAGE=oem-rackspace

changelog/changes/2023-11-29-sysext-for-gce-oem.md

@@ -0,0 +1 @@
+- GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` and being part of the OEM A/B updates ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146))

sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r4.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r5.ebuild

@@ -31,6 +31,7 @@ fi
 COMMON_OEMIDS=(
     ami
     azure
+    gce
     openstack
     packet
     qemu

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/gce/grub.cfg.frag

@@ -1,7 +1,3 @@
-# Flatcar GRUB settings
-
-set oem_id="gce"
-
 # GCE only has a serial console.
 set linux_console="console=ttyS0,115200n8"
 serial com0 --speed=115200 --word=8 --parity=no

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r6.ebuild

@@ -0,0 +1,13 @@
+/etc/systemd/system/multi-user.target.wants/oem-cloudinit.service
+/etc/systemd/system/multi-user.target.wants/oem-gce.service
+/etc/systemd/system/oem-cloudinit.service
+/etc/systemd/system/oem-gce-enable-oslogin.service
+/etc/systemd/system/oem-gce.service
+/etc/systemd/system/sysinit.target.wants/oem-gce-enable-oslogin.service
+/oem/base/
+/oem/bin/
+/oem/files/
+/oem/flatcar-oem-gce.aci
+/oem/units/
+/var/lib/flatcar-oem-gce
+/var/lib/flatcar-oem-gce.img