Skip to content

Commit

Permalink
docker: Switch to inheriting from go.bbclass
Browse files Browse the repository at this point in the history
Inherit from the Go class rather than depending on it as this breaks
the Pyro build.

Change-type: patch
Changelog-entry: Switch docker to inherit from Go class
Signed-off-by: Will Newton <willn@resin.io>
  • Loading branch information
Will Newton committed Sep 18, 2017
1 parent dcf11aa commit c7677d8
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions meta-resin-common/recipes-containers/docker/docker_git.bb
Expand Up @@ -42,13 +42,16 @@ BBCLASSEXTEND = " native"
DOCKER_VERSION = "17.06.0-dev"
PV = "${DOCKER_VERSION}+git${SRCREV}"

DEPENDS_append_class-native = " go"
DEPENDS_append_class-target = " systemd go-cross"
DEPENDS_append_class-target = " systemd"
RDEPENDS_${PN}_class-target = "curl util-linux iptables tini systemd"
RRECOMMENDS_${PN} += " kernel-module-nf-nat"
DOCKER_PKG="github.com/docker/docker"

inherit systemd
inherit systemd go

# oe-meta-go recipes try to build go-cross-native
DEPENDS_remove_class-native = "go-cross-native"
DEPENDS_append_class-native = " go-native"

do_configure() {
}
Expand Down

0 comments on commit c7677d8

Please sign in to comment.