From 48c81bc9783b5ee05d0913564d11e6702d943fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Sat, 6 Apr 2024 19:09:43 +0200 Subject: [PATCH 1/5] oem: provide hetzner images --- build_library/vm_image_util.sh | 8 ++++++++ ...s-0-r6.ebuild => common-oem-files-0-r7.ebuild} | 1 + .../coreos-base/oem-hetzner/metadata.xml | 4 ++++ .../coreos-base/oem-hetzner/oem-hetzner-0.ebuild | 15 +++++++++++++++ 4 files changed, 28 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/{common-oem-files-0-r6.ebuild => common-oem-files-0-r7.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 48f9818886..f570afe886 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -15,6 +15,7 @@ VALID_IMG_TYPES=( digitalocean exoscale gce + hetzner hyperv hyperv_vhdx iso @@ -48,6 +49,7 @@ VALID_OEM_PACKAGES=( digitalocean exoscale gce + hetzner hyperv openstack packet @@ -278,6 +280,12 @@ IMG_azure_OEM_USE=azure IMG_azure_OEM_PACKAGE=common-oem-files IMG_azure_OEM_SYSEXT=oem-azure +## hetzner +IMG_hetzner_DISK_LAYOUT=vm +IMG_hetzner_OEM_USE=hetzner +IMG_hetzner_OEM_PACKAGE=common-oem-files +IMG_hetzner_OEM_SYSEXT=oem-hetzner + ## hyper-v IMG_hyperv_DISK_FORMAT=vhd IMG_hyperv_OEM_PACKAGE=oem-hyperv diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild index c1dd66b61d..d2fae08320 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild @@ -31,6 +31,7 @@ fi COMMON_OEMIDS=( ami azure + hetzner openstack packet qemu diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml new file mode 100644 index 0000000000..097975e3ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml @@ -0,0 +1,4 @@ + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild new file mode 100644 index 0000000000..78251ef249 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OEM suite for Hetzner" +HOMEPAGE="https://hetzner.com" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="" + +OEM_NAME="Hetzner" From 5ac7c0943848a463d753fe511cad91800c07c9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Thu, 11 Apr 2024 16:55:24 +0200 Subject: [PATCH 2/5] overlay afterburn: enable for Hetzner OEM --- .../coreos-base/afterburn/files/coreos-metadata.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service index be98ac93ca..1081c1fc33 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service @@ -19,6 +19,8 @@ ConditionKernelCommandLine=|coreos.oem.id=packet ConditionKernelCommandLine=|flatcar.oem.id=scaleway +ConditionKernelCommandLine=|flatcar.oem.id=hetzner + Description=Flatcar Metadata Agent [Service] From 08ba85c6a3a77e39e0ad52d3b1be07fc7cf67b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Tue, 16 Apr 2024 15:46:06 +0200 Subject: [PATCH 3/5] changelog: add entry for hetzner images --- changelog/changes/2024-04-16-hetzner.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2024-04-16-hetzner.md diff --git a/changelog/changes/2024-04-16-hetzner.md b/changelog/changes/2024-04-16-hetzner.md new file mode 100644 index 0000000000..2273bd8ad0 --- /dev/null +++ b/changelog/changes/2024-04-16-hetzner.md @@ -0,0 +1 @@ +- Added Hetzner images ([flatcar/scripts#1880](https://github.com/flatcar/scripts/pull/1880)) From e2f6180b47be290b308b1aa49826cb175ac52ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Tue, 16 Apr 2024 17:10:44 +0200 Subject: [PATCH 4/5] sys-kernel/bootengine: Bump commit for Hetzner OEM support --- ...ootengine-0.0.38-r29.ebuild => bootengine-0.0.38-r30.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r29.ebuild => bootengine-0.0.38-r30.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r29.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r30.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r29.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r30.ebuild 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 0db1969d1b..8035a33f1b 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="6c2fba412dbce9a011535a9e57332e1307072855" # flatcar-master + CROS_WORKON_COMMIT="78d94b311ddb047b280c5ee180410b48ec04ea39" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 1cf9d7f1592ac436752b983e2bb7da3c06f08c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Tue, 16 Apr 2024 17:11:44 +0200 Subject: [PATCH 5/5] coreos-base/coreos-init: Bump commit for Hetzner OEM support --- ...eos-init-0.0.1-r191.ebuild => coreos-init-0.0.1-r192.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r191.ebuild => coreos-init-0.0.1-r192.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r191.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r192.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r191.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r192.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index f222114e64..b211353ed4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-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="f35d50bed4c6556fee3ee40fef0d35ee9f3bc2c5" # flatcar-master + CROS_WORKON_COMMIT="96e929df6c04df58a87187cf2a769923e5ecdf41" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi