From 105e15cb5e50b570b8a5934e9e995667921ba34e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 18 Sep 2024 17:45:48 +0200 Subject: [PATCH] build_library: remove two Docker files not used on Flatcar They were previously in /usr/share/docker/contrib which means they were deleted at build time and not shipped into Docker sysext. New ebuild version of Docker now provides those two files as symlinks to /usr/share/docker/contrib from /usr/bin. We can't really remove symlinks using find as docker-runc, docker-containerd, etc. are broken symlinks too during the build phase. Signed-off-by: Mathieu Tortuyaux --- build_library/sysext_mangle_docker-flatcar | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build_library/sysext_mangle_docker-flatcar b/build_library/sysext_mangle_docker-flatcar index 69287160233..0ec584bbfd0 100755 --- a/build_library/sysext_mangle_docker-flatcar +++ b/build_library/sysext_mangle_docker-flatcar @@ -6,6 +6,9 @@ rootfs="${1}" # Remove debug and contrib echo ">>> NOTICE: $0: removing '/usr/lib/debug/', '/usr/share/docker/contrib' from sysext" rm -rf "${rootfs}/usr/lib/debug/" "${rootfs}/usr/share/docker/contrib/" +# For Docker 27.2.1, two files are symlinked to /usr/share/docker/contrib +# There were previously shipped directly in /usr/share/docker/contrib folder +rm -f "${rootfs}/usr/bin/{dockerd-rootless-setuptool.sh,dockerd-rootless.sh}" script_root="$(cd "$(dirname "$0")/../"; pwd)" files_dir="${script_root}/sdk_container/src/third_party/coreos-overlay/coreos/sysext/docker"