[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7644/8267] go.bbclass: exported function cleanup



commit 2381d15cc62a7ada15d9f8af39a0d32701282c3b
Author: Matt Madison <matt@madison.systems>
Date:   Fri Sep 8 18:04:38 2017 -0300

    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.
    
    (From OE-Core rev: 0369a99ad1c9e3a9a6394c723461795460dc2c76)
    
    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>

 meta/classes/go.bbclass |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index f64b07f..6df73bf 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]