From cbda50b4ff428b808c6dc8ee6b8e465a1bd5fb7a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 13 Sep 2022 11:15:44 +0200 Subject: [PATCH 1/2] coreos-base/coreos: add sys-devel/gettext This Flatcar dependency needs to be now explicitly pulled in the OS since this commit: https://github.com/flatcar-linux/coreos-overlay/pull/1724/commits/4a06200e9d92dc8066425cfc18dd6b7c5aa99131 Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 00704e3855..1b31293d59 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -78,6 +78,7 @@ RDEPEND="${RDEPEND} app-emulation/xenstore )" +# sys-devel/gettext: it embeds 'envsubst' binary which is useful for simple file templating. RDEPEND="${RDEPEND} app-admin/etcd-wrapper app-admin/flannel-wrapper @@ -175,6 +176,7 @@ RDEPEND="${RDEPEND} sys-block/parted sys-boot/efibootmgr sys-cluster/ipvsadm + sys-devel/gettext sys-fs/btrfs-progs sys-fs/cryptsetup sys-fs/dosfstools From 3df1f2e579bf4bd00b87bd7cebf4260a237c4b65 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 13 Sep 2022 11:18:49 +0200 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/changelog/bugfixes/2022-09-13-gettext.md | 1 + .../coreos-overlay/changelog/updates/2022-09-13-gettext.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-09-13-gettext.md create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-13-gettext.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-09-13-gettext.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-09-13-gettext.md new file mode 100644 index 0000000000..2d34861365 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-09-13-gettext.md @@ -0,0 +1 @@ +- Added back `gettext` to the OS ([Flatcar#849](https://github.com/flatcar-linux/Flatcar/issues/849)) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-13-gettext.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-13-gettext.md new file mode 100644 index 0000000000..549368a140 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-13-gettext.md @@ -0,0 +1 @@ +- gettext ([0.21](https://www.gnu.org/software/gettext/))