overlay coreos-base/oem-packet: migrate to sysext format

Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar · Sep 29, 2023 · e731a42 · e731a42
1 parent 55bc3d8
commit e731a42
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 85 deletions.
diff --git 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/...on-oem-files/common-oem-files-0-r3.ebuild → ...on-oem-files/common-oem-files-0-r4.ebuild b/...on-oem-files/common-oem-files-0-r3.ebuild → ...on-oem-files/common-oem-files-0-r4.ebuild
@@ -8,6 +8,7 @@ OEMIDS=(
     azure
     digitalocean
     openstack
+    packet
     qemu
     vmware
 )

diff --git a/...lay/coreos-base/oem-packet/files/grub.cfg → ...mmon-oem-files/files/packet/grub.cfg.frag b/...lay/coreos-base/oem-packet/files/grub.cfg → ...mmon-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/oem-packet/files/base/README b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/base/README
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
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
diff --git a/...c/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/...c/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service
diff --git a/...ontainer/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild b/...ontainer/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r1.ebuild
diff --git a/...ontainer/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2-r2.ebuild b/...ontainer/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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ OEMIDS=( @@
         azure
         digitalocean
         openstack
+        packet
         qemu
         vmware
     )
@@ Expand Down @@