From b36cb287683c681c881e3c232240b83debbd9641 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 27 Sep 2023 13:06:31 +0200 Subject: [PATCH] overlay coreos-base/oem-packet: migrate to sysext format Signed-off-by: Mathieu Tortuyaux --- build_library/vm_image_util.sh | 4 ++- ...r3.ebuild => common-oem-files-0-r4.ebuild} | 1 + .../files/packet/grub.cfg.frag} | 3 -- .../coreos-base/misc-files/files/oems/packet | 4 +++ .../coreos-base/oem-packet/files/base/README | 4 --- .../oem-packet/files/base/base.ign | 29 ------------------- .../coreos-base/oem-packet/files/oem-release | 5 ---- .../files/units/packet-phone-home.service | 14 --------- .../oem-packet/oem-packet-0.2.2-r1.ebuild | 29 ------------------- .../oem-packet/oem-packet-0.2.2-r2.ebuild | 15 ++++++++++ 10 files changed, 23 insertions(+), 85 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/{common-oem-files-0-r3.ebuild => common-oem-files-0-r4.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{oem-packet/files/grub.cfg => common-oem-files/files/packet/grub.cfg.frag} (81%) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/packet delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/base.ign delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r2.ebuild diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 947577f4e1..76159bf090 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -306,7 +306,9 @@ IMG_cloudsigma_DISK_FORMAT=qcow2 IMG_cloudsigma_OEM_PACKAGE=oem-cloudsigma ## packet -IMG_packet_OEM_PACKAGE=oem-packet +IMG_packet_OEM_PACKAGE=common-oem-files +IMG_packet_OEM_SYSEXT=oem-packet +IMG_packet_OEM_USE=packet ########################################################### diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r4.ebuild index 4bac0cf199..108c67b88d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r4.ebuild @@ -8,6 +8,7 @@ OEMIDS=( azure digitalocean openstack + packet qemu vmware ) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/packet/grub.cfg.frag similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/packet/grub.cfg.frag index f780fd76ec..45ca3913a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/packet/grub.cfg.frag @@ -1,6 +1,3 @@ -# Flatcar GRUB settings - -set oem_id="packet" set linux_append="flatcar.autologin" if [ "$grub_cpu" = i386 ] || [ "$grub_cpu" = x86_64 ]; then diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/packet b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/packet new file mode 100644 index 0000000000..36b1e0b513 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/packet @@ -0,0 +1,4 @@ +/etc/systemd/system/multi-user.target.requires/coreos-metadata-sshkeys@core.service +/etc/systemd/system/packet-phone-home.service +/oem/base/ +/oem/units/ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/README b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/README deleted file mode 100644 index d128309fef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/README +++ /dev/null @@ -1,4 +0,0 @@ -These Ignition configs are part of the OEM configuration. Do not modify -them. If you want to write an Ignition config directly to disk, put it in -../config.ign and it will be applied at first boot instead of a config -in userdata. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/base.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/base.ign deleted file mode 100644 index 5c530660c4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/base.ign +++ /dev/null @@ -1,29 +0,0 @@ -{ - "ignition": { - "version": "2.1.0" - }, - "storage": { - "files": [ - { - "filesystem": "root", - "path": "/etc/systemd/system/packet-phone-home.service", - "contents": { - "source": "oem:///units/packet-phone-home.service" - }, - "mode": 292 - } - ] - }, - "systemd": { - "units": [ - { - "name": "coreos-metadata-sshkeys@.service", - "enabled": true - }, - { - "name": "packet-phone-home.service", - "enabled": true - } - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release deleted file mode 100644 index 61c35df879..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release +++ /dev/null @@ -1,5 +0,0 @@ -ID=packet -VERSION_ID=@@OEM_VERSION_ID@@ -NAME="Packet" -HOME_URL="https://packet.net" -BUG_REPORT_URL="https://issues.flatcar.org" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service deleted file mode 100644 index c74cf022ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Report Success to Packet -ConditionFirstBoot=true -Requires=coreos-metadata.service -After=coreos-metadata.service - -[Service] -EnvironmentFile=/run/metadata/flatcar -ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}" -Restart=on-failure -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild deleted file mode 100644 index 76ab3d84af..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OEM suite for Packet images" -HOMEPAGE="" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 x86" - -# no source directory -S="${WORKDIR}" - -src_prepare() { - default - sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ - "${FILESDIR}/oem-release" > "${T}/oem-release" || die -} - -src_install() { - insinto "/oem" - doins "${FILESDIR}/grub.cfg" - doins "${T}/oem-release" - doins -r "${FILESDIR}/base" - doins -r "${FILESDIR}/units" -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r2.ebuild new file mode 100644 index 0000000000..f746b6de87 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2020 Kinvolk GmbH. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Equinix Metal suite for Equinix Metal" +HOMEPAGE="https://www.equinix.com/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="" + +OEM_NAME="Equinix Metal"