diff options
| -rw-r--r-- | classes/base.bbclass | 7 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 9 | ||||
| -rw-r--r-- | packages/e17/edje-editor_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/e17/edje-viewer_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/gaim/pidgin_2.1.0.bb | 9 | ||||
| -rw-r--r-- | packages/gtkhtml2/gtkhtml2_svn.bb (renamed from packages/gtkhtml2/gtkhtml2_cvs.bb) | 0 | ||||
| -rw-r--r-- | packages/starling/starling_0.2.bb | 3 | ||||
| -rw-r--r-- | packages/starling/starling_svn.bb | 3 | ||||
| -rw-r--r-- | packages/uboot/u-boot-mkimage-gta01-native_oe.bb | 1 |
10 files changed, 31 insertions, 7 deletions
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}" 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" 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 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" diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_svn.bb index 1f19550c90..1f19550c90 100644 --- a/packages/gtkhtml2/gtkhtml2_cvs.bb +++ b/packages/gtkhtml2/gtkhtml2_svn.bb 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 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 \ |