summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 14:32:08 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 14:32:08 +0000
commit40abdeadf7a4fca26ffbe39972b4cdfa9412e145 (patch)
treee1c68dbe84598d8a49bf999a95016807329413bd /meta
parentcb5f3a4c9affaabf2cbe5eb46b2ff59b5558c4f8 (diff)
downloadpoky-40abdeadf7a4fca26ffbe39972b4cdfa9412e145.tar.gz
helix-libs/ribosome: Convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/helix/helix-libs.bb26
-rw-r--r--meta/packages/helix/ribosome.bb20
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() {
25 ${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter 25 ${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
26} 26}
27 27
28do_stage() {
29 mkdir -p ${STAGING_DIR_HOST}/opt/helix/lib
30 mkdir -p ${STAGING_DIR_HOST}/opt/helix/include
31 mkdir -p ${STAGING_DIR_HOST}/usr/lib/pkgconfig
32
33 install -m 0644 clientapps/clutter/player.h \
34 ${STAGING_DIR_HOST}/opt/helix/include
35 install -m 0644 ../helix-libs/helix-player.pc \
36 ${STAGING_DIR_HOST}/usr/lib/pkgconfig
37
38 install -m 0644 release/*.so ${STAGING_DIR_HOST}/opt/helix/lib
39
40 install -d ${STAGING_DIR_HOST}${libdir}
41 install -m 0644 release/libhelix-player.so ${STAGING_DIR_HOST}${libdir}
42}
43
44do_install() { 28do_install() {
45 mkdir -p ${D}/opt/helix/lib 29 mkdir -p ${D}/opt/helix/lib
46 mkdir -p ${D}/opt/helix/include 30 mkdir -p ${D}/opt/helix/include
47 mkdir -p ${D}/usr/lib/pkgconfig 31 mkdir -p ${D}${libdir}/pkgconfig
48 32
49 install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/ 33 install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
50 install -m 0644 ../helix-libs/helix-player.pc ${D}/usr/lib/pkgconfig 34 install -m 0644 ../helix-libs/helix-player.pc ${D}${libdir}/pkgconfig
51 35
52 install -m 0644 release/*.so ${D}/opt/helix/lib 36 install -m 0644 release/*.so ${D}/opt/helix/lib
53 37
@@ -55,6 +39,10 @@ do_install() {
55 install -m 0644 release/libhelix-player.so ${D}${libdir} 39 install -m 0644 release/libhelix-player.so ${D}${libdir}
56} 40}
57 41
42sysroot_stage_all_append() {
43 sysroot_stage_dir ${D}/opt/helix ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/helix
44}
45
58FILES_${PN} = "/usr/lib/libhelix-player.so" 46FILES_${PN} = "/usr/lib/libhelix-player.so"
59FILES_${PN} += "/opt/helix/lib" 47FILES_${PN} += "/opt/helix/lib"
60FILES_${PN}-dev = "/usr/lib/pkgconfig" 48FILES_${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 \
12 ${_TARBALL_SERVER}/client-bif-${_SNAPSHOT}.tar.bz2 \ 12 ${_TARBALL_SERVER}/client-bif-${_SNAPSHOT}.tar.bz2 \
13 ${_TARBALL_SERVER}/common-bif-${_SNAPSHOT}.tar.bz2 \ 13 ${_TARBALL_SERVER}/common-bif-${_SNAPSHOT}.tar.bz2 \
14 file://ribosome/clutter.bif \ 14 file://ribosome/clutter.bif \
15 file://ribosome/buildrc" 15 file://ribosome/buildrc"
16 16
17S = "${WORKDIR}" 17S = "${WORKDIR}"
18 18
19COMPATIBLE_HOST = '(i.86.*-linux)' 19COMPATIBLE_HOST = '(i.86.*-linux)'
20 20
21do_stage() { 21do_install() {
22 # Install build system of doom 22 # Install build system of doom
23 install -d ${STAGING_DIR_HOST}${libdir} 23 install -d ${D}${libdir}
24 cp -a ribosome-${_SNAPSHOT} ${STAGING_DIR_HOST}${libdir}/ribosome 24 cp -a ribosome-${_SNAPSHOT} ${D}${libdir}/ribosome
25 install -m 0644 ribosome/buildrc ${STAGING_DIR_HOST}${libdir}/ribosome/ 25 install -m 0644 ribosome/buildrc ${D}${libdir}/ribosome/
26 26
27 # Install client BIF's 27 # Install client BIF's
28 install -d ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF 28 install -d ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
29 install -m 0644 client-bif-${_SNAPSHOT}/*.bif \ 29 install -m 0644 client-bif-${_SNAPSHOT}/*.bif \
30 ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF 30 ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
31 31
32 # Install common BIF's 32 # Install common BIF's
33 install -d ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/common/build/BIF 33 install -d ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
34 install -m 0644 common-bif-${_SNAPSHOT}/*.bif \ 34 install -m 0644 common-bif-${_SNAPSHOT}/*.bif \
35 ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/common/build/BIF 35 ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
36 36
37 # Install our own custom BIF 37 # Install our own custom BIF
38 install -m 0644 ribosome/*.bif ${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/ 38 install -m 0644 ribosome/*.bif ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
39} 39}