From aa509c629e1f623ff63ae2f685f5605b309a0e3d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 20 Sep 2019 09:18:05 +0200 Subject: cni: move cni tools to /usr/libexec/cni Use a standard location to store the cni tools and plugins. This is more in line how other distributions package cni. Keep a symlink to /opt/cni/bin for backward compatibility. Signed-off-by: Stefan Agner Signed-off-by: Bruce Ashfield --- recipes-networking/cni/cni_git.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'recipes-networking/cni') diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 5348b953..b8adf886 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -63,16 +63,20 @@ do_compile() { } do_install() { - localbindir="/opt/cni/bin" + localbindir="${libexecdir}/cni/" install -d ${D}${localbindir} install -d ${D}/${sysconfdir}/cni/net.d install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} install -m 755 -D ${WORKDIR}/plugins/bin/* ${D}/${localbindir} + + # Parts of k8s expect the cni binaries to be available in /opt/cni + install -d ${D}/opt/cni + ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin } -FILES_${PN} += "/opt/cni/bin/*" +FILES_${PN} += "${libexecdir}/cni/* /opt/cni/bin" INSANE_SKIP_${PN} += "ldflags already-stripped" -- cgit v1.2.3-54-g00ecf