MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

go: use inherit go versus explicit DEPENDS

Browse Source 
We can now use the oe-core go bbclass to get our DEPENDS correct
for building these go packages.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2017-03-20 15:54:50 -04:00
parent b44fce825d
commit a050e7a61d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/docker/docker_git.bb
View File

@ -38,7 +38,6 @@ DOCKER_VERSION = "1.13.0"
PV = "${DOCKER_VERSION}+git${SRCREV_docker}" PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
DEPENDS = " \ DEPENDS = " \
go-cross-${TARGET_ARCH} \
go-cli \ go-cli \
go-pty \ go-pty \
go-context \ go-context \
@ -61,7 +60,7 @@ DEPENDS = " \
PACKAGES =+ "${PN}-contrib" PACKAGES =+ "${PN}-contrib"
DEPENDS_append_class-target = "lvm2" DEPENDS_append_class-target = " lvm2"
RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \
${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \
" "
@ -132,6 +131,7 @@ do_compile() {
} }
inherit systemd update-rc.d inherit systemd update-rc.d
inherit go
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"

2
recipes-networking/netns/netns_git.bb
View File

@ -2,7 +2,6 @@ HOMEPAGE = "https://github.com/jfrazelle/netns"
SUMMARY = "Runc hook for setting up default bridge networking." SUMMARY = "Runc hook for setting up default bridge networking."
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1" LIC_FILES_CHKSUM = "file://LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
DEPENDS = "go-cross-${TARGET_ARCH}"
SRC_URI = "git://github.com/jfrazelle/netns;branch=master" SRC_URI = "git://github.com/jfrazelle/netns;branch=master"
SRCREV = "2804050eeab661bfa75c3aa06bdcf60273b02ca7" SRCREV = "2804050eeab661bfa75c3aa06bdcf60273b02ca7"
@ -11,6 +10,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit go-osarchmap inherit go-osarchmap
inherit go
do_compile() { do_compile() {
export GOARCH="${TARGET_GOARCH}" export GOARCH="${TARGET_GOARCH}"