diff options
-rw-r--r-- | recipes-containers/cri-o/files/crio.conf | 2 | ||||
-rw-r--r-- | 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 51d7f404..9135df08 100644 --- a/recipes-containers/cri-o/files/crio.conf +++ b/recipes-containers/cri-o/files/crio.conf | |||
@@ -144,4 +144,4 @@ registries = [ | |||
144 | network_dir = "/etc/cni/net.d/" | 144 | network_dir = "/etc/cni/net.d/" |
145 | 145 | ||
146 | # plugin_dir is is where CNI plugin binaries are stored. | 146 | # plugin_dir is is where CNI plugin binaries are stored. |
147 | plugin_dir = "/opt/cni/bin/" | 147 | plugin_dir = "/opt/cni/bin" |
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() { | |||
63 | } | 63 | } |
64 | 64 | ||
65 | do_install() { | 65 | do_install() { |
66 | localbindir="/opt/cni/bin" | 66 | localbindir="${libexecdir}/cni/" |
67 | 67 | ||
68 | install -d ${D}${localbindir} | 68 | install -d ${D}${localbindir} |
69 | install -d ${D}/${sysconfdir}/cni/net.d | 69 | install -d ${D}/${sysconfdir}/cni/net.d |
70 | 70 | ||
71 | install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} | 71 | install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} |
72 | install -m 755 -D ${WORKDIR}/plugins/bin/* ${D}/${localbindir} | 72 | install -m 755 -D ${WORKDIR}/plugins/bin/* ${D}/${localbindir} |
73 | |||
74 | # Parts of k8s expect the cni binaries to be available in /opt/cni | ||
75 | install -d ${D}/opt/cni | ||
76 | ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin | ||
73 | } | 77 | } |
74 | 78 | ||
75 | FILES_${PN} += "/opt/cni/bin/*" | 79 | FILES_${PN} += "${libexecdir}/cni/* /opt/cni/bin" |
76 | 80 | ||
77 | INSANE_SKIP_${PN} += "ldflags already-stripped" | 81 | INSANE_SKIP_${PN} += "ldflags already-stripped" |
78 | 82 | ||