From c6d34fdb72ad0ed95761304c8396ddec0701c51a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 2 Sep 2025 09:51:16 +0200 Subject: [PATCH 1/4] sysext: add vim to a 'tools' sysext image Signed-off-by: Mathieu Tortuyaux --- build_library/extra_sysexts.sh | 1 + .../{coreos-0.0.1-r318.ebuild => coreos-0.0.1-r319.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- ...ackages-0.0.1-r17.ebuild => board-packages-0.0.1-r18.ebuild} | 0 .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 1 + 5 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r318.ebuild => coreos-0.0.1-r319.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/{board-packages-0.0.1-r17.ebuild => board-packages-0.0.1-r18.ebuild} (100%) diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh index 85ae7096fc3..ca6ffe3db3e 100644 --- a/build_library/extra_sysexts.sh +++ b/build_library/extra_sysexts.sh @@ -9,6 +9,7 @@ EXTRA_SYSEXTS=( "nvidia-drivers-570-open|x11-drivers/nvidia-drivers:0/570|kernel-open persistenced|amd64" "podman|app-containers/podman,net-misc/passt" "python|dev-lang/python,dev-python/pip" + "tools|app-editors/vim" "zfs|sys-fs/zfs" ) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r318.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r319.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r318.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r319.ebuild 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 22564c301cc..39daa165959 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 @@ -104,7 +104,7 @@ RDEPEND="${RDEPEND} app-crypt/gnupg app-crypt/go-tspi app-crypt/tpmpolicy - app-editors/vim + app-editors/nano app-emulation/qemu-guest-agent app-containers/cri-tools app-misc/ca-certificates diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r17.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r18.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index e89d4114449..1b723e1abc8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -33,6 +33,7 @@ RDEPEND=" app-containers/docker-buildx app-containers/docker-cli app-containers/incus + app-editors/vim app-emulation/amazon-ssm-agent app-emulation/hv-daemons app-emulation/wa-linux-agent From 05e7fb85e59bacfc7446b905fff9ca689442e43e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 2 Sep 2025 09:51:49 +0200 Subject: [PATCH 2/4] use: do not build 'minimal' vim This enables regular Vim installation ('huge') Signed-off-by: Mathieu Tortuyaux --- .../profiles/coreos/targets/generic/package.use | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index aa39f4a3838..bb368372233 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 app-admin/sudo ldap sssd -# -crypt: Disable crypt to avoid installing libsodlium. -app-editors/vim minimal -crypt +# -crypt: Disable crypt to avoid installing libsodium. +app-editors/vim -crypt # minimal: Don't pull app-vim/gentoo-syntax app-editors/vim-core minimal From 2e2385f70e8cfe0be93fff8fdac2b77942783557 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 2 Sep 2025 09:52:19 +0200 Subject: [PATCH 3/4] misc-files: add enabled-sysext.conf This provides an initial 'tools' sysext Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/misc-files/files/flatcar/enabled-sysext.conf | 1 + .../{misc-files-0-r8.ebuild => misc-files-0-r9.ebuild} | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/flatcar/enabled-sysext.conf rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/{misc-files-0-r8.ebuild => misc-files-0-r9.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/flatcar/enabled-sysext.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/flatcar/enabled-sysext.conf new file mode 100644 index 00000000000..ef1aab0d0e8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/flatcar/enabled-sysext.conf @@ -0,0 +1 @@ +tools diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r9.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r9.ebuild index 15a0374c975..be7abe88210 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r9.ebuild @@ -204,4 +204,7 @@ src_install() { # (The below keepdir will result in a tmpfiles entry in base_image_var.conf) keepdir /var/kubernetes/kubelet-plugins/volume/exec dosym /var/kubernetes/kubelet-plugins/volume/exec /usr/libexec/kubernetes/kubelet-plugins/volume/exec + + insinto "/usr/share/flatcar" + doins "${FILESDIR}/flatcar/enabled-sysext.conf" } From 54f88be76eee2b04cd75c49887969915fd379d6a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 3 Sep 2025 10:16:29 +0200 Subject: [PATCH 4/4] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/changes/2025-09-03-sysext-vim.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2025-09-03-sysext-vim.md diff --git a/changelog/changes/2025-09-03-sysext-vim.md b/changelog/changes/2025-09-03-sysext-vim.md new file mode 100644 index 00000000000..557d84e4f53 --- /dev/null +++ b/changelog/changes/2025-09-03-sysext-vim.md @@ -0,0 +1 @@ +- `vim` is now provided as part of a `tools` sysext image which is enabled by default ([scripts#2502](https://github.com/flatcar/scripts/pull/2502))