diff options
Diffstat (limited to 'recipes-containers/cri-o/cri-o_git.bb')
-rw-r--r-- | recipes-containers/cri-o/cri-o_git.bb | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 6be8d6fe..822c57ff 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | HOMEPAGE = "https://github.com/kubernetes-incubator/cri-o" | 1 | HOMEPAGE = "https://github.com/kubernetes-sigs/cri-o" |
2 | SUMMARY = "Open Container Initiative-based implementation of Kubernetes Container Runtime Interface" | 2 | SUMMARY = "Open Container Initiative-based implementation of Kubernetes Container Runtime Interface" |
3 | DESCRIPTION = "cri-o is meant to provide an integration path between OCI conformant \ | 3 | DESCRIPTION = "cri-o is meant to provide an integration path between OCI conformant \ |
4 | runtimes and the kubelet. Specifically, it implements the Kubelet Container Runtime \ | 4 | runtimes and the kubelet. Specifically, it implements the Kubelet Container Runtime \ |
@@ -14,9 +14,9 @@ At a high level, we expect the scope of cri-o to be restricted to the following | |||
14 | - Resource isolation as required by the CRI \ | 14 | - Resource isolation as required by the CRI \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV_cri-o = "65faae67828fb3eb3eac05b582aae9f9d1dea51c" | 17 | SRCREV_cri-o = "774a29ecf6855f2dff266dc2aa2fe81d7d964465" |
18 | SRC_URI = "\ | 18 | SRC_URI = "\ |
19 | git://github.com/kubernetes-incubator/cri-o.git;nobranch=1;name=cri-o \ | 19 | git://github.com/kubernetes-sigs/cri-o.git;nobranch=1;name=cri-o \ |
20 | file://0001-Makefile-force-symlinks.patch \ | 20 | file://0001-Makefile-force-symlinks.patch \ |
21 | file://crio.conf \ | 21 | file://crio.conf \ |
22 | " | 22 | " |
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 | |||
27 | 27 | ||
28 | GO_IMPORT = "import" | 28 | GO_IMPORT = "import" |
29 | 29 | ||
30 | PV = "1.0.0-rc3-dev+git${SRCREV_cri-o}" | 30 | PV = "1.12.0+git${SRCREV_cri-o}" |
31 | 31 | ||
32 | DEPENDS = " \ | 32 | DEPENDS = " \ |
33 | glib-2.0 \ | 33 | glib-2.0 \ |
@@ -69,15 +69,18 @@ do_compile() { | |||
69 | rm -f ${S}/src/import/vendor/src | 69 | rm -f ${S}/src/import/vendor/src |
70 | ln -sf ./ ${S}/src/import/vendor/src | 70 | ln -sf ./ ${S}/src/import/vendor/src |
71 | 71 | ||
72 | mkdir -p ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o | 72 | mkdir -p ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o |
73 | ln -sf ../../../../cmd ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/cmd | 73 | ln -sf ../../../../cmd ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/cmd |
74 | ln -sf ../../../../test ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/test | 74 | ln -sf ../../../../test ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/test |
75 | ln -sf ../../../../oci ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/oci | 75 | ln -sf ../../../../oci ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/oci |
76 | ln -sf ../../../../server ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/server | 76 | ln -sf ../../../../server ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/server |
77 | ln -sf ../../../../pkg ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/pkg | 77 | ln -sf ../../../../pkg ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/pkg |
78 | ln -sf ../../../../libpod ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/libpod | 78 | ln -sf ../../../../libpod ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/libpod |
79 | ln -sf ../../../../libkpod ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/libkpod | 79 | ln -sf ../../../../libkpod ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/libkpod |
80 | ln -sf ../../../../utils ${S}/src/import/vendor/github.com/kubernetes-incubator/cri-o/utils | 80 | ln -sf ../../../../utils ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/utils |
81 | ln -sf ../../../../types ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/types | ||
82 | ln -sf ../../../../version ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/version | ||
83 | ln -sf ../../../../lib ${S}/src/import/vendor/github.com/kubernetes-sigs/cri-o/lib | ||
81 | 84 | ||
82 | export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" | 85 | export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" |
83 | export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" | 86 | export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" |
@@ -111,12 +114,11 @@ do_install() { | |||
111 | install -d ${D}/${sysconfdir}/crio/config/ | 114 | install -d ${D}/${sysconfdir}/crio/config/ |
112 | install -m 755 -D ${S}/src/import/test/testdata/* ${D}/${sysconfdir}/crio/config/ | 115 | install -m 755 -D ${S}/src/import/test/testdata/* ${D}/${sysconfdir}/crio/config/ |
113 | 116 | ||
114 | install ${S}/src/import/crio ${D}/${localbindir} | 117 | install ${S}/src/import/bin/crio ${D}/${localbindir} |
115 | install ${S}/src/import/crioctl ${D}/${localbindir} | 118 | install ${S}/src/import/bin/crio-config ${D}/${localbindir} |
116 | install ${S}/src/import/kpod ${D}/${localbindir} | ||
117 | 119 | ||
118 | install ${S}/src/import/conmon/conmon ${D}/${libexecdir}/crio | 120 | install ${S}/src/import/bin/conmon ${D}/${localbindir}/crio |
119 | install ${S}/src/import/pause/pause ${D}/${libexecdir}/crio | 121 | install ${S}/src/import/bin/pause ${D}/${localbindir}/crio |
120 | 122 | ||
121 | install -m 0644 ${S}/src/import/contrib/systemd/crio.service ${D}${systemd_unitdir}/system/ | 123 | install -m 0644 ${S}/src/import/contrib/systemd/crio.service ${D}${systemd_unitdir}/system/ |
122 | install -m 0644 ${S}/src/import/contrib/systemd/crio-shutdown.service ${D}${systemd_unitdir}/system/ | 124 | install -m 0644 ${S}/src/import/contrib/systemd/crio-shutdown.service ${D}${systemd_unitdir}/system/ |