Signed-off-by: Pascal Bach <[email protected]>
---
recipes-containers/containerd/containerd.inc | 80 +++++++-------
recipes-containers/docker/docker_git.bb | 120 ++++++++++-----------
recipes-containers/runc/runc.inc | 56 +++++-----
recipes-devtools/python/python3-docker_2.5.1.bb | 6 +-
.../linux/linux-yocto_virtualization.inc | 6 +-
5 files changed, 134 insertions(+), 134 deletions(-)
diff --git a/recipes-containers/containerd/containerd.inc
b/recipes-containers/containerd/containerd.inc
index e7a3719..f91e018 100644
--- a/recipes-containers/containerd/containerd.inc
+++ b/recipes-containers/containerd/containerd.inc
@@ -25,30 +25,30 @@ INSANE_SKIP_${PN} += "ldflags"
do_configure[noexec] = "1"
do_compile() {
- # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
- # docker to download its dependencies but rather
- # use dependencies packaged independently.
- cd ${S}
- rm -rf .gopath
- mkdir -p .gopath/src/"$(dirname "${CONTAINERD_PKG}")"
- ln -sf ../../../.. .gopath/src/"${CONTAINERD_PKG}"
-
- export GOPATH="${WORKDIR}/git/"
- export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export GOARCH="${TARGET_GOARCH}"
- export CGO_ENABLED="1"
- export CFLAGS=""
- export LDFLAGS=""
- export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export GO_GCFLAGS=""
- export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH}
--sysroot=${STAGING_DIR_TARGET}"
- export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH}
--sysroot=${STAGING_DIR_TARGET}"
-
- oe_runmake static
+ # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
+ # docker to download its dependencies but rather
+ # use dependencies packaged independently.
+ cd ${S}
+ rm -rf .gopath
+ mkdir -p .gopath/src/"$(dirname "${CONTAINERD_PKG}")"
+ ln -sf ../../../.. .gopath/src/"${CONTAINERD_PKG}"
+
+ export GOPATH="${WORKDIR}/git/"
+ export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
+
+ # Pass the needed cflags/ldflags so that cgo
+ # can find the needed headers files and libraries
+ export GOARCH="${TARGET_GOARCH}"
+ export CGO_ENABLED="1"
+ export CFLAGS=""
+ export LDFLAGS=""
+ export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ export GO_GCFLAGS=""
+ export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH}
--sysroot=${STAGING_DIR_TARGET}"
+ export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH}
--sysroot=${STAGING_DIR_TARGET}"
+
+ oe_runmake static
}
# Note: disabled for now, since docker is launching containerd
@@ -57,22 +57,22 @@ do_compile() {
# SYSTEMD_SERVICE_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
do_install() {
- mkdir -p ${D}/${bindir}
-
- cp ${S}/bin/containerd ${D}/${bindir}/containerd
- cp ${S}/bin/containerd-shim ${D}/${bindir}/containerd-shim
- cp ${S}/bin/ctr ${D}/${bindir}/containerd-ctr
-
- ln -sf containerd ${D}/${bindir}/docker-containerd
- ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim
- ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
- install -d ${D}${systemd_unitdir}/system
- install -m 644 ${WORKDIR}/containerd.service
${D}/${systemd_unitdir}/system
- # adjust from /usr/local/bin to /usr/bin/
- sed -e
"s:/usr/local/bin/containerd:${bindir}/docker-containerd:g" -i
${D}/${systemd_unitdir}/system/containerd.service
- fi
+ mkdir -p ${D}/${bindir}
+
+ cp ${S}/bin/containerd ${D}/${bindir}/containerd
+ cp ${S}/bin/containerd-shim ${D}/${bindir}/containerd-shim
+ cp ${S}/bin/ctr ${D}/${bindir}/containerd-ctr
+
+ ln -sf containerd ${D}/${bindir}/docker-containerd
+ ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim
+ ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 644 ${WORKDIR}/containerd.service
${D}/${systemd_unitdir}/system
+ # adjust from /usr/local/bin to /usr/bin/
+ sed -e "s:/usr/local/bin/containerd:${bindir}/docker-containerd:g" -i
${D}/${systemd_unitdir}/system/containerd.service
+ fi
}
FILES_${PN} += "${systemd_system_unitdir}/*"
diff --git a/recipes-containers/docker/docker_git.bb
b/recipes-containers/docker/docker_git.bb
index 4ba5e81..5ae9211 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -22,13 +22,13 @@ SRCREV_docker = "e639a70fbe999d96354a5bcf560231b7b8aa935c"
SRCREV_libnetwork = "26addf43a5d925ff79d262dbbdb5344bc2b6e198"
SRCREV_cli = "a765218f1988e85b68aa3977f34893ec7b059a60"
SRC_URI = "\
- git://github.com/moby/moby.git;nobranch=1;name=docker \
-
git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork
\
- git://github.com/docker/cli;branch=master;name=cli;destsuffix=cli \
- file://docker.init \
- file://hi.Dockerfile \
- file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \
- "
+ git://github.com/moby/moby.git;nobranch=1;name=docker \
+
git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork
\
+ git://github.com/docker/cli;branch=master;name=cli;destsuffix=cli \
+ file://docker.init \
+ file://hi.Dockerfile \
+ file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \
+ "
# Apache-2.0 for docker
LICENSE = "Apache-2.0"
@@ -80,41 +80,41 @@ inherit goarch
do_configure[noexec] = "1"
do_compile() {
- # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
- # docker to download its dependencies but rather
- # use dependencies packaged independently.
- cd ${S}/src/import
- rm -rf .gopath
- mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
- ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
-
- mkdir -p .gopath/src/github.com/docker
- ln -sf ${WORKDIR}/libnetwork .gopath/src/github.com/docker/libnetwork
- ln -sf ${WORKDIR}/cli .gopath/src/github.com/docker/cli
-
- export
GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
- export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export GOARCH=${TARGET_GOARCH}
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- # in order to exclude devicemapper and btrfs -
https://github.com/docker/docker/issues/14056
- export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs
exclude_graphdriver_devicemapper'
-
- # this is the unsupported built structure
- # that doesn't rely on an existing docker
- # to build this:
- DOCKER_GITCOMMIT="${SRCREV}" \
- ./hack/make.sh dynbinary
-
- # build the proxy
- go build -o ${S}/src/import/docker-proxy
github.com/docker/libnetwork/cmd/proxy
-
- # build the cli
- go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker
github.com/docker/cli/cmd/docker
+ # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
+ # docker to download its dependencies but rather
+ # use dependencies packaged independently.
+ cd ${S}/src/import
+ rm -rf .gopath
+ mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
+ ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
+
+ mkdir -p .gopath/src/github.com/docker
+ ln -sf ${WORKDIR}/libnetwork .gopath/src/github.com/docker/libnetwork
+ ln -sf ${WORKDIR}/cli .gopath/src/github.com/docker/cli
+
+ export
GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
+ export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
+
+ # Pass the needed cflags/ldflags so that cgo
+ # can find the needed headers files and libraries
+ export GOARCH=${TARGET_GOARCH}
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ # in order to exclude devicemapper and btrfs -
https://github.com/docker/docker/issues/14056
+ export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs
exclude_graphdriver_devicemapper'
+
+ # this is the unsupported built structure
+ # that doesn't rely on an existing docker
+ # to build this:
+ DOCKER_GITCOMMIT="${SRCREV}" \
+ ./hack/make.sh dynbinary
+
+ # build the proxy
+ go build -o ${S}/src/import/docker-proxy
github.com/docker/libnetwork/cmd/proxy
+
+ # build the cli
+ go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker
github.com/docker/cli/cmd/docker
}
SYSTEMD_PACKAGES =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
@@ -127,24 +127,24 @@ INITSCRIPT_NAME_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','sysvinit','dock
INITSCRIPT_PARAMS_${PN} = "defaults"
do_install() {
- mkdir -p ${D}/${bindir}
- cp ${S}/src/import/bundles/latest/dynbinary-client/docker
${D}/${bindir}/docker
- cp ${S}/src/import/bundles/latest/dynbinary-daemon/dockerd
${D}/${bindir}/dockerd
- cp ${S}/src/import/docker-proxy ${D}/${bindir}/docker-proxy
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
- install -d ${D}${systemd_unitdir}/system
- install -m 644 ${S}/src/import/contrib/init/systemd/docker.*
${D}/${systemd_unitdir}/system
- # replaces one copied from above with one that uses the local
registry for a mirror
- install -m 644
${S}/src/import/contrib/init/systemd/docker.service
${D}/${systemd_unitdir}/system
- else
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/docker.init
${D}${sysconfdir}/init.d/docker.init
- fi
-
- mkdir -p ${D}${datadir}/docker/
- cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/
- install -m 0755 ${S}/src/import/contrib/check-config.sh
${D}${datadir}/docker/
+ mkdir -p ${D}/${bindir}
+ cp ${S}/src/import/bundles/latest/dynbinary-client/docker
${D}/${bindir}/docker
+ cp ${S}/src/import/bundles/latest/dynbinary-daemon/dockerd
${D}/${bindir}/dockerd
+ cp ${S}/src/import/docker-proxy ${D}/${bindir}/docker-proxy
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 644 ${S}/src/import/contrib/init/systemd/docker.*
${D}/${systemd_unitdir}/system
+ # replaces one copied from above with one that uses the local registry
for a mirror
+ install -m 644 ${S}/src/import/contrib/init/systemd/docker.service
${D}/${systemd_unitdir}/system
+ else
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/docker.init
${D}${sysconfdir}/init.d/docker.init
+ fi
+
+ mkdir -p ${D}${datadir}/docker/
+ cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/
+ install -m 0755 ${S}/src/import/contrib/check-config.sh
${D}${datadir}/docker/
}
inherit useradd
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc
index 0179103..23f31c4 100644
--- a/recipes-containers/runc/runc.inc
+++ b/recipes-containers/runc/runc.inc
@@ -23,38 +23,38 @@ do_configure[noexec] = "1"
EXTRA_OEMAKE="BUILDTAGS=''"
do_compile() {
- # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
- # docker to download its dependencies but rather
- # use dependencies packaged independently.
- cd ${S}/src/import
- rm -rf .gopath
- dname=`dirname "${LIBCONTAINER_PACKAGE}"`
- bname=`basename "${LIBCONTAINER_PACKAGE}"`
- mkdir -p .gopath/src/${dname}
-
- (cd .gopath/src/${dname}; ln -sf ../../../../../${bname} ${bname})
- export
GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
-
- # Fix up symlink for go-cross compiler
- rm -f ${S}/src/import/vendor/src
- ln -sf ./ ${S}/src/import/vendor/src
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CFLAGS=""
- export LDFLAGS=""
-
- oe_runmake static
+ # Set GOPATH. See 'PACKAGERS.md'. Don't rely on
+ # docker to download its dependencies but rather
+ # use dependencies packaged independently.
+ cd ${S}/src/import
+ rm -rf .gopath
+ dname=`dirname "${LIBCONTAINER_PACKAGE}"`
+ bname=`basename "${LIBCONTAINER_PACKAGE}"`
+ mkdir -p .gopath/src/${dname}
+
+ (cd .gopath/src/${dname}; ln -sf ../../../../../${bname} ${bname})
+ export
GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
+
+ # Fix up symlink for go-cross compiler
+ rm -f ${S}/src/import/vendor/src
+ ln -sf ./ ${S}/src/import/vendor/src
+
+ # Pass the needed cflags/ldflags so that cgo
+ # can find the needed headers files and libraries
+ export CGO_ENABLED="1"
+ export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+ export CFLAGS=""
+ export LDFLAGS=""
+
+ oe_runmake static
}
do_install() {
- mkdir -p ${D}/${bindir}
+ mkdir -p ${D}/${bindir}
- cp ${S}/src/import/runc ${D}/${bindir}/runc
- ln -sf runc ${D}/${bindir}/docker-runc
+ cp ${S}/src/import/runc ${D}/${bindir}/runc
+ ln -sf runc ${D}/${bindir}/docker-runc
}
INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-devtools/python/python3-docker_2.5.1.bb
b/recipes-devtools/python/python3-docker_2.5.1.bb
index 341d95c..d686239 100644
--- a/recipes-devtools/python/python3-docker_2.5.1.bb
+++ b/recipes-devtools/python/python3-docker_2.5.1.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] =
"b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d
DEPENDS += "${PYTHON_PN}-pip-native"
RDEPENDS_${PN} += " \
- python3-docker-pycreds \
- python3-requests \
- python3-websocket-client \
+ python3-docker-pycreds \
+ python3-requests \
+ python3-websocket-client \
"
diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc
b/recipes-kernel/linux/linux-yocto_virtualization.inc
index 9905ed9..51fa250 100644
--- a/recipes-kernel/linux/linux-yocto_virtualization.inc
+++ b/recipes-kernel/linux/linux-yocto_virtualization.inc
@@ -2,10 +2,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
SRC_URI += "file://xt-checksum.scc \
file://ebtables.scc \
- file://vswitch.scc \
- file://lxc.scc \
+ file://vswitch.scc \
+ file://lxc.scc \
file://docker.scc \
- "
+ "
KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm',
'features/kvm/qemu-kvm-enable.scc', '', d)}"
KERNEL_MODULE_AUTOLOAD += "openvswitch"
--
2.11.0
--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization
