From f8e7a07034947b382747f1bb38f4f690a32ed8b4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 7 Jun 2024 07:52:11 +0200 Subject: [PATCH 1/2] coreos-base/coreos-init: bump init this pulls the issuegen fix. Signed-off-by: Mathieu Tortuyaux --- ...eos-init-0.0.1-r192.ebuild => coreos-init-0.0.1-r193.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-r192.ebuild => coreos-init-0.0.1-r193.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r192.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r193.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r192.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r193.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 b211353ed4d..cbfe1bbbb6a 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="96e929df6c04df58a87187cf2a769923e5ecdf41" # flatcar-master + CROS_WORKON_COMMIT="33b692d9d67e8d9b09378bb2be2a66d1aa439a15" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From f48098f31b8c025056ee72d221d7a9a6212eb975 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 7 Jun 2024 07:56:52 +0200 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/bugfixes/2024-06-07-issuegen.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2024-06-07-issuegen.md diff --git a/changelog/bugfixes/2024-06-07-issuegen.md b/changelog/bugfixes/2024-06-07-issuegen.md new file mode 100644 index 00000000000..d1ce4c8d163 --- /dev/null +++ b/changelog/bugfixes/2024-06-07-issuegen.md @@ -0,0 +1 @@ +- Fixed issue file generation from '/etc/issue.d' ([scripts#2018](https://github.com/flatcar/scripts/pull/2018))