This email list is read-only. Emails sent to this list will be discarded
----------------------------------
helix-libs.bb | 20 +++++++++++++-------
ribosome.bb | 32 +++++++++++++++++++++++---------
2 files changed, 36 insertions(+), 16 deletions(-)
New commits:
commit 4557eaa694eda77851c3e8bd4dc996417308e2be
Author: Rusty Lynch <[EMAIL PROTECTED]>
Date: Wed Oct 22 04:16:12 2008 -0700
* Updating ribosome and helix-libs to pull from release snapshots
Diff in this email is a maximum of 400 lines.
diff --git a/helix-libs.bb b/helix-libs.bb
index 5f0646a..83c9d81 100644
--- a/helix-libs.bb
+++ b/helix-libs.bb
@@ -1,15 +1,18 @@
DESCRIPTION = "Helix Client Libraries"
SECTION = "base"
-DEPENDS = "ribosome gtk+"
+DEPENDS = "ribosome gtk+ libxv"
HOMEPAGE = "http://helixcommunity.org";
LICENSE = "RPSL"
-PV="r4"
+_SNAPSHOT = "atlas310_11212008"
+_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty";
-SRC_URI =
"http://git.moblin.org/repos/users/rusty/helix-libs_atlas310_11212008.tar.bz2 \
+PV="r0"
+
+SRC_URI = "${_TARBALL_SERVER}/helix-libs_${_SNAPSHOT}.tar.bz2 \
file://helix-libs/helix-player.pc \
file://helix-libs/add-clutter.patch;patch=1"
-S = "${WORKDIR}/helix-libs_atlas310_11212008"
+S = "${WORKDIR}/helix-libs_${_SNAPSHOT}"
export BUILD_ROOT=${STAGING_DIR_HOST}${libdir}/ribosome
export BUILDRC=${BUILD_ROOT}/buildrc
@@ -25,8 +28,10 @@ do_stage() {
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-player.pc ${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
@@ -40,7 +45,7 @@ do_install() {
mkdir -p ${D}/usr/lib/pkgconfig
install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
- install -m 0644 helix-player.pc ${D}/usr/lib/pkgconfig
+ install -m 0644 ../helix-libs/helix-player.pc ${D}/usr/lib/pkgconfig
install -m 0644 release/*.so ${D}/opt/helix/lib
@@ -49,5 +54,6 @@ do_install() {
}
FILES_${PN} = "/usr/lib/libhelix-player.so"
+FILES_${PN} += "/opt/helix/lib"
FILES_${PN}-dev = "/usr/lib/pkgconfig"
FILES_${PN}-dev += "/opt/helix/include"
diff --git a/ribosome.bb b/ribosome.bb
index 881d005..4339a6c 100644
--- a/ribosome.bb
+++ b/ribosome.bb
@@ -3,21 +3,35 @@ SECTION = "base"
HOMEPAGE = "http://helixcommunity.org";
LICENSE = "GPLv2"
-PV="r3"
+_SNAPSHOT = "22102008"
+_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty";
-SRC_URI =
"cvs://cvs.helixcommunity.org/cvsroot/ribosome;module=build;method=ext;date=now
\
-
cvs://cvs.helixcommunity.org/cvsroot/client;module=build/BIF;method=ext;date=now
\
+PV="r0"
+
+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"
S = "${WORKDIR}"
do_stage() {
- mkdir -p ${STAGING_DIR_HOST}${libdir}
- cp -a build ${STAGING_DIR_HOST}${libdir}/ribosome
- cp ribosome/buildrc ${STAGING_DIR_HOST}${libdir}/ribosome/
+ # 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 client BIF's
+ install -d
${STAGING_DIR_HOST}${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
+
+ # Install common BIF's
+ install -d
${STAGING_DIR_HOST}${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
- mkdir -p
${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
- cp -a BIF/*
${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
- cp ribosome/clutter.bif
${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
+ # Install our own custom BIF
+ install -m 0644 ribosome/*.bif
${STAGING_DIR_HOST}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
}
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
