From e893cc89bd1bc1744c21c691f443905ce1ef68e5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 4 Sep 2024 16:23:33 +0200 Subject: [PATCH] overlay coreos/config: Drop split-usr workarounds for sys-apps/kmod --- .../coreos/config/env/sys-apps/kmod | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/kmod diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/kmod b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/kmod deleted file mode 100644 index 58eaab0a2e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/kmod +++ /dev/null @@ -1,20 +0,0 @@ -# sbin and bin are still separate directories and the build system of -# kmod puts the tool symlinks into bin, whereas most places that use -# absolute paths to the tools expect them to be in sbin. Move them -# there. This can be removed if we merge bin and sbin directories -# (likely to happen when we migrate to 23.0 profiles). -cros_post_src_install_move_kmod_tools_symlinks() { - local kmod tool - - # path to kmod relative to sbin - if [[ -x "${ED}/usr/sbin/kmod" ]]; then - kmod=kmod - else - kmod=../bin/kmod - fi - mkdir -p "${ED}/usr/sbin" - for tool in modprobe rmmod insmod depmod; do - rm -f "${ED}/usr/bin/${tool}" "${ED}/bin/${tool}" - ln -sf "${kmod}" "${ED}/usr/sbin/${tool}" - done -}