helix-libs/ribosome: Convert to use do_install for staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 17 insertions, 29 deletions

diff --git a/meta/packages/helix/helix-libs.bb b/meta/packages/helix/helix-libs.bb
index 604ec622c6..9fcbd4b67f 100644
--- a/meta/packages/helix/helix-libs.bb
+++ b/meta/packages/helix/helix-libs.bb
@@ -25,29 +25,13 @@ do_compile() {
         ${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
 }
 
-do_stage() {
-        mkdir -p ${STAGING_DIR_HOST}/opt/helix/lib
-        mkdir -p ${STAGING_DIR_HOST}/opt/helix/include
-        mkdir -p ${STAGING_DIR_HOST}/usr/lib/pkgconfig
-
-        install -m 0644 clientapps/clutter/player.h \
-                        ${STAGING_DIR_HOST}/opt/helix/include
-        install -m 0644 ../helix-libs/helix-player.pc \
-                        ${STAGING_DIR_HOST}/usr/lib/pkgconfig
-
-        install -m 0644 release/*.so ${STAGING_DIR_HOST}/opt/helix/lib
-
-        install -d ${STAGING_DIR_HOST}${libdir}
-        install -m 0644 release/libhelix-player.so ${STAGING_DIR_HOST}${libdir}
-}
-
 do_install() {
-        mkdir -p ${D}/opt/helix/lib
+        mkdir -p ${D}/opt/helix/lib
         mkdir -p ${D}/opt/helix/include
-        mkdir -p ${D}/usr/lib/pkgconfig
+        mkdir -p ${D}${libdir}/pkgconfig
 
         install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
-        install -m 0644 ../helix-libs/helix-player.pc ${D}/usr/lib/pkgconfig
+        install -m 0644 ../helix-libs/helix-player.pc ${D}${libdir}/pkgconfig
 
         install -m 0644 release/*.so ${D}/opt/helix/lib
 
@@ -55,6 +39,10 @@ do_install() {
         install -m 0644 release/libhelix-player.so ${D}${libdir}
 }
 
+sysroot_stage_all_append() {
+        sysroot_stage_dir ${D}/opt/helix ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/helix
+}
+
 FILES_${PN} = "/usr/lib/libhelix-player.so"
 FILES_${PN} += "/opt/helix/lib"
 FILES_${PN}-dev = "/usr/lib/pkgconfig"
diff --git a/meta/packages/helix/ribosome.bb b/meta/packages/helix/ribosome.bb
index 840fc855eb..6e8ae1f680 100644
--- a/meta/packages/helix/ribosome.bb
+++ b/meta/packages/helix/ribosome.bb
@@ -12,28 +12,28 @@ SRC_URI = "${_TARBALL_SERVER}/ribosome-${_SNAPSHOT}.tar.bz2 \
            ${_TARBALL_SERVER}/client-bif-${_SNAPSHOT}.tar.bz2 \
            ${_TARBALL_SERVER}/common-bif-${_SNAPSHOT}.tar.bz2 \
            file://ribosome/clutter.bif \
-           file://ribosome/buildrc"
+           file://ribosome/buildrc"
 
 S = "${WORKDIR}"
 
 COMPATIBLE_HOST = '(i.86.*-linux)'
 
-do_stage() {
+do_install() {
         # Install build system of doom
-        install -d ${STAGING_DIR_HOST}${libdir}
-        cp -a ribosome-${_SNAPSHOT} ${STAGING_DIR_HOST}${libdir}/ribosome
-        install -m 0644 ribosome/buildrc ${STAGING_DIR_HOST}${libdir}/ribosome/
+        install -d ${D}${libdir}
+        cp -a ribosome-${_SNAPSHOT} ${D}${libdir}/ribosome
+        install -m 0644 ribosome/buildrc ${D}${libdir}/ribosome/
 
         # Install client BIF's
-        install -d ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
+        install -d ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
         install -m 0644 client-bif-${_SNAPSHOT}/*.bif \
-           ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
+           ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
 
         # Install common BIF's
-        install -d ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
+        install -d ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
         install -m 0644 common-bif-${_SNAPSHOT}/*.bif \
-           ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
+           ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
 
         # Install our own custom BIF
-        install -m 0644 ribosome/*.bif ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
+        install -m 0644 ribosome/*.bif ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
 }