From: Stefan Agner <[email protected]> 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 <[email protected]> --- recipes-containers/cri-o/files/crio.conf | 2 +- recipes-networking/cni/cni_git.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-containers/cri-o/files/crio.conf b/recipes-containers/cri-o/files/crio.conf index 51d7f40..9135df0 100644 --- a/recipes-containers/cri-o/files/crio.conf +++ b/recipes-containers/cri-o/files/crio.conf @@ -144,4 +144,4 @@ registries = [ network_dir = "/etc/cni/net.d/" # plugin_dir is is where CNI plugin binaries are stored. -plugin_dir = "/opt/cni/bin/" +plugin_dir = "/opt/cni/bin" diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 5348b95..b8adf88 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" -- 2.20.1 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
