From e249708e10bdb4713195de31329dbe05dc3d18d1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Sep 2017 18:04:44 -0300 Subject: go-helloworld: Use the Golang examples repository This updates the recipe to use the Golang examples repository so it makes use of the unpack as well as standard tasks showing how easy it can be. (From OE-Core rev: 116d2ea1fe92725bb1265152f3db51598643a481) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- .../go-examples/files/helloworld.go | 10 --------- meta/recipes-extended/go-examples/go-examples.inc | 10 --------- .../go-examples/go-helloworld_0.1.bb | 24 ++++++++++++++-------- 3 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-extended/go-examples/files/helloworld.go delete mode 100644 meta/recipes-extended/go-examples/go-examples.inc (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/go-examples/files/helloworld.go b/meta/recipes-extended/go-examples/files/helloworld.go deleted file mode 100644 index 0253c40411..0000000000 --- a/meta/recipes-extended/go-examples/files/helloworld.go +++ /dev/null @@ -1,10 +0,0 @@ -// You can edit this code! -// Click here and start typing. -// taken from https://golang.org/ -package main - -import "fmt" - -func main() { - fmt.Println("Hello, 世界") -} diff --git a/meta/recipes-extended/go-examples/go-examples.inc b/meta/recipes-extended/go-examples/go-examples.inc deleted file mode 100644 index c63268116b..0000000000 --- a/meta/recipes-extended/go-examples/go-examples.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "This is a simple example recipe that cross-compiles a Go program." -SECTION = "examples" -HOMEPAGE = "https://golang.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -S = "${WORKDIR}" - -inherit go diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 930c57df95..222fc9d349 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -1,13 +1,19 @@ -require go-examples.inc +DESCRIPTION = "This is a simple example recipe that cross-compiles a Go program." +SECTION = "examples" +HOMEPAGE = "https://golang.org/" -SRC_URI += " \ - file://helloworld.go \ -" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -do_compile() { - go build helloworld.go -} +SRC_URI = "git://${GO_IMPORT}" +SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" + +GO_IMPORT = "github.com/golang/example" +GO_INSTALL = "${GO_IMPORT}/hello" + +inherit go -do_install() { - install -D -m 0755 ${S}/helloworld ${D}${bindir}/helloworld +# This is just to make clear where this example is +do_install_append() { + mv ${D}${bindir}/hello ${D}${bindir}/${BPN} } -- cgit v1.2.3-54-g00ecf