From cedb40dd1c5f833f74a611fb315b5292bc6e6151 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 11:09:02 +0000 Subject: u-boot-mkimage-gta01-native_oe.bb: remove conflicting patch --- packages/uboot/u-boot-mkimage-gta01-native_oe.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb index 2eafac668f..5946be9c3f 100644 --- a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb +++ b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb @@ -5,7 +5,6 @@ PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238" SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \ file://uboot-machtypes.patch;patch=1 \ file://ext2load_hex.patch;patch=1 \ -file://uboot-mokoversion.patch;patch=1 \ file://uboot-s3c2410-warnings-fix.patch;patch=1 \ file://uboot-strtoul.patch;patch=1 \ file://uboot-cramfs_but_no_jffs2.patch;patch=1 \ -- cgit v1.2.3 From dae07f85049f80b2f2ee2bef157b4714d9394516 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 11:17:00 +0000 Subject: edje*: these packages are from cvs, not svn --- packages/e17/edje-editor_cvs.bb | 2 +- packages/e17/edje-viewer_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb index 72c83dc56e..b2483f2bfb 100644 --- a/packages/e17/edje-editor_cvs.bb +++ b/packages/e17/edje-editor_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje-Editor is just that." LICENSE = "MIT" DEPENDS = "etk" -PV = "0.0.0+svn${SRCDATE}" +PV = "0.0.0+cvs${SRCDATE}" PR = "r0" inherit e diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb index 9b21c042a0..1a15746ca4 100644 --- a/packages/e17/edje-viewer_cvs.bb +++ b/packages/e17/edje-viewer_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje_Viewer is just that." DEPENDS = "etk" LICENSE = "MIT" -PV = "0.0.0+svn${SRCDATE}" +PV = "0.0.0+cvs${SRCDATE}" PR = "r0" inherit e -- cgit v1.2.3 From 62687be1d2d5ba481f24326914401661ca8f4fcc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 11:17:53 +0000 Subject: gtkhtml2: fetch from svn --- packages/gtkhtml2/gtkhtml2_cvs.bb | 28 ---------------------------- packages/gtkhtml2/gtkhtml2_svn.bb | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 packages/gtkhtml2/gtkhtml2_cvs.bb create mode 100644 packages/gtkhtml2/gtkhtml2_svn.bb diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_cvs.bb deleted file mode 100644 index 1f19550c90..0000000000 --- a/packages/gtkhtml2/gtkhtml2_cvs.bb +++ /dev/null @@ -1,28 +0,0 @@ -SECTION = "libs" -DEPENDS = "gtk+ glib-2.0 libxml2" -DESCRIPTION = "A GTK+ HTML rendering library." -LICENSE = "GPL" -PV = "2.11.0+svn${SRCDATE}" -PR = "r4" - -SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ - http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;patch=1;pnum=0 \ - http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;patch=1;pnum=0" - -S = "${WORKDIR}/trunk" - -inherit pkgconfig autotools - -EXTRA_OECONF = " --disable-accessibility" - -do_stage() { - oe_libinstall -so -C libgtkhtml libgtkhtml-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml - ( for i in css document dom dom/core dom/events dom/html dom/traversal dom/views graphics layout layout/html util view; do install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; install -m 0644 ${S}/libgtkhtml/$i/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; done ) - install -m 0644 ${S}/libgtkhtml/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml -} - diff --git a/packages/gtkhtml2/gtkhtml2_svn.bb b/packages/gtkhtml2/gtkhtml2_svn.bb new file mode 100644 index 0000000000..1f19550c90 --- /dev/null +++ b/packages/gtkhtml2/gtkhtml2_svn.bb @@ -0,0 +1,28 @@ +SECTION = "libs" +DEPENDS = "gtk+ glib-2.0 libxml2" +DESCRIPTION = "A GTK+ HTML rendering library." +LICENSE = "GPL" +PV = "2.11.0+svn${SRCDATE}" +PR = "r4" + +SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ + http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;patch=1;pnum=0" + +S = "${WORKDIR}/trunk" + +inherit pkgconfig autotools + +EXTRA_OECONF = " --disable-accessibility" + +do_stage() { + oe_libinstall -so -C libgtkhtml libgtkhtml-2 ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml + ( for i in css document dom dom/core dom/events dom/html dom/traversal dom/views graphics layout layout/html util view; do install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; install -m 0644 ${S}/libgtkhtml/$i/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; done ) + install -m 0644 ${S}/libgtkhtml/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml +} + -- cgit v1.2.3 From d6999084ed62711f579370df6cd739e217cc3d15 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 12:51:01 +0000 Subject: pidgin: update to 2.1.0 --- packages/gaim/pidgin_2.1.0.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/gaim/pidgin_2.1.0.bb diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb new file mode 100644 index 0000000000..e0f865722e --- /dev/null +++ b/packages/gaim/pidgin_2.1.0.bb @@ -0,0 +1,9 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + " + +PR = "r0" -- cgit v1.2.3 From 0adc9ee1289b5437b6386a44060117a8a5207f01 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 31 Jul 2007 15:57:04 +0000 Subject: base.bbclass: Remove warnings for older bitbake users --- classes/base.bbclass | 7 +++++++ conf/bitbake.conf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index fec7622f18..5381d43e7b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -892,6 +892,13 @@ python () { base_after_parse(d) } +# Remove me when we switch to bitbake 1.8.8 +def base_get_srcrev(d): + import bb + + if bb.fetch.get_srcrev: + return bb.fetch.get_srcrev(d) + return "NOT IMPLEMENTED" # Patch handling inherit patch diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 38a716af00..19910d32e7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -365,7 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" -SRCREV = "${@bb.fetch.get_srcrev(d)}" +SRCREV = "${@base_get_srcrev(d)}" SRC_URI = "file://${FILE}" -- cgit v1.2.3 From f89fc38904e333aaa0ab588a741087b32564987d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 31 Jul 2007 16:18:22 +0000 Subject: starling: Update svn version number and use esd instead of some pulseaudio which does not seem to be available. --- packages/starling/starling_0.2.bb | 3 ++- packages/starling/starling_svn.bb | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb index 9b389c53cc..6080491cb2 100644 --- a/packages/starling/starling_0.2.bb +++ b/packages/starling/starling_0.2.bb @@ -3,7 +3,8 @@ SECTION = "gpe/multimedia" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" -RDEPENDS = "pulseaudio-bin \ + +RDEPENDS = "esd \ gst-plugin-audioconvert \ gst-plugin-esd \ gst-plugin-typefindfunctions \ diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb index 25d445f6ee..67d98dbd60 100644 --- a/packages/starling/starling_svn.bb +++ b/packages/starling/starling_svn.bb @@ -14,8 +14,7 @@ RRECOMMENDS = "gst-plugin-mad \ gst-plugin-ivorbis \ gst-plugin-tcp" -PV = "0.1+svn${SRCDATE}" - +PV = "0.2+svn${SRCDATE}" inherit gpe autotools -- cgit v1.2.3 From 816db9f91c684f3d81c16e10fe1410c3530a2389 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 31 Jul 2007 21:38:22 +0000 Subject: openmoko.conf: Use mirrors to balance load and set FEED_URIS --- conf/distro/openmoko.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index bd4e2076ca..5d63676343 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -15,3 +15,12 @@ DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" + +CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" + +PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/" + +FEED_URIS = "\ + all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \ + armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \ + fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01" -- cgit v1.2.3