From 356955b3e013bb801528c7e39458547756c7e93f Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 29 Nov 2024 15:25:52 +0100 Subject: [PATCH 1/3] sysext: turn vim to a sysext image Signed-off-by: Mathieu Tortuyaux --- build_library/extra_sysexts.sh | 1 + .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 - ...packages-0.0.1-r16.ebuild => board-packages-0.0.1-r17.ebuild} | 0 .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/{board-packages-0.0.1-r16.ebuild => board-packages-0.0.1-r17.ebuild} (100%) diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh index c52a2f5c4a6..39c87dd412c 100644 --- a/build_library/extra_sysexts.sh +++ b/build_library/extra_sysexts.sh @@ -2,4 +2,5 @@ EXTRA_SYSEXTS=( zfs:sys-fs/zfs podman:app-containers/podman,net-misc/passt python:dev-lang/python,dev-python/pip + vim:app-editors/vim ) 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 4d6a180e869..d4d3e22b673 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,6 @@ RDEPEND="${RDEPEND} app-crypt/gnupg app-crypt/go-tspi app-crypt/tpmpolicy - app-editors/vim 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-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r17.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r17.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 f1a8b24861c..7f16db1bcb1 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 @@ -32,6 +32,7 @@ RDEPEND=" app-containers/docker app-containers/docker-cli app-containers/docker-buildx + app-editors/vim app-emulation/amazon-ssm-agent app-emulation/hv-daemons app-emulation/wa-linux-agent From d3b5d323925ed65320289b710f99f81cb5c17b81 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 29 Nov 2024 15:28:43 +0100 Subject: [PATCH 2/3] 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 742eca0fb24..348c3bbca67 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 @@ -3,9 +3,9 @@ app-admin/sudo ldap sssd # -crypt: Disable crypt to avoid installing libsodlium. -app-editors/vim minimal -crypt +app-editors/vim -crypt # minimal: Don't pull app-vim/gentoo-syntax -app-editors/vim-core minimal +app-editors/vim-core minimal # Install our modifications and compatibility symlinks for ssh and ntp # From a029ec87eb82660910465f13d71f0432da249e96 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 2 Dec 2024 11:03:34 +0100 Subject: [PATCH 3/3] misc-files: add enabled-sysext.conf Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/misc-files/files/flatcar/enabled-sysext.conf | 1 + .../{misc-files-0-r6.ebuild => misc-files-0-r7.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-r6.ebuild => misc-files-0-r7.ebuild} (99%) 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..f027e0d4b7b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/flatcar/enabled-sysext.conf @@ -0,0 +1 @@ +vim diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild index a66ef091a89..6439728e553 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild @@ -207,4 +207,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 "/etc/flatcar" + doins "${FILESDIR}/flatcar/enabled-sysext.conf" }