aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2017-09-08 18:04:38 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:14 +0100
commit0369a99ad1c9e3a9a6394c723461795460dc2c76 (patch)
tree347ef02f481c6addbde82dcef0db7f70dff15985
parent7a40ea8fc358aa134ad86862591329f94d0f3718 (diff)
downloadopenembedded-core-contrib-0369a99ad1c9e3a9a6394c723461795460dc2c76.tar.gz
openembedded-core-contrib-0369a99ad1c9e3a9a6394c723461795460dc2c76.tar.bz2
openembedded-core-contrib-0369a99ad1c9e3a9a6394c723461795460dc2c76.zip
go.bbclass: exported function cleanup
Since this is a class, it should follow the class function export mechanism for its task functions, and should set directory-related flags for directories they need. Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/go.bbclass14
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index f64b07fd82b..6df73bf377b 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -51,14 +51,14 @@ FILES_${PN}-staticdev += "${GOPKG_FINAL}/${GO_IMPORT}*"
GO_INSTALL ?= "${GO_IMPORT}/..."
-do_go_compile() {
+go_do_compile() {
GOPATH=${S}:${STAGING_LIBDIR}/${TARGET_SYS}/go go env
if [ -n "${GO_INSTALL}" ]; then
GOPATH=${S}:${STAGING_LIBDIR}/${TARGET_SYS}/go go install ${GOBUILDFLAGS} ${GO_INSTALL}
fi
}
-do_go_install() {
+go_do_install() {
rm -rf ${WORKDIR}/staging
install -d ${WORKDIR}/staging${GOROOT_FINAL} ${D}${GOROOT_FINAL}
tar -C ${S} -cf - . | tar -C ${WORKDIR}/staging${GOROOT_FINAL} -xpvf -
@@ -84,11 +84,7 @@ do_go_install() {
rmdir -p "${D}${GOBIN_FINAL}" || true
fi
}
+do_install[dirs] =+ "${WORKDIR}/staging"
+do_install[cleandirs] += "${WORKDIR}/staging"
-do_compile() {
- do_go_compile
-}
-
-do_install() {
- do_go_install
-}
+EXPORT_FUNCTIONS do_compile do_install