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 68b7d2db9896da6c0126f770be127b624c0a52fb Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 31 Jul 2007 13:54:56 +0000 Subject: I am to stupid some times it not comes from gettext, it comes from file-native. --- packages/gettext/gettext-native_0.14.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb index efc43ac4d3..6203b1f9d7 100644 --- a/packages/gettext/gettext-native_0.14.1.bb +++ b/packages/gettext/gettext-native_0.14.1.bb @@ -2,7 +2,6 @@ require gettext_${PV}.bb S = "${WORKDIR}/gettext-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}" inherit native -DEPENDS = "zlib-native" PROVIDES = "" M4 = "\ -- cgit v1.2.3 From 0b26f096fa49da14e38beec8df358f901e541536 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 31 Jul 2007 14:14:52 +0000 Subject: file-native/compress.c needs zlib.h so it must depend on zlib-native --- packages/file/file-native_4.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/file/file-native_4.21.bb b/packages/file/file-native_4.21.bb index 59535dd518..734891d18d 100644 --- a/packages/file/file-native_4.21.bb +++ b/packages/file/file-native_4.21.bb @@ -1,6 +1,6 @@ require file_${PV}.bb inherit native -DEPENDS = "" +DEPENDS = "zlib-native" PR = "r0" SRC_URI += "file://native-fix.diff;patch=1" -- cgit v1.2.3 From 6bd781d384bb0741999927087ece0c58b85b57fc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 15:20:40 +0000 Subject: contrib/mtn2cl: generate dated changelogs --- contrib/mtn2cl/mtn2cl.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index a6c042333f..f404def82d 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -1,9 +1,8 @@ #/bin/sh -# This script takes the last 1000 revs and writes a ChangeLog - mkdir logs +export LOGNAME=Changelog.`date -u "+%Y%m%d"` export REV_NOW=`mtn automate heads |head -n1` for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \ @@ -17,9 +16,9 @@ done cd logs for i in * ; do \ - echo $i: >> ../ChangeLog - cat $i >> ../ChangeLog - echo >> ../ChangeLog + echo $i: >> ../${LOGNAME} + cat $i >> ../${LOGNAME} + echo >> ../${LOGNAME} done cd .. @@ -30,13 +29,13 @@ wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=a NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`" RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`" -echo -e "\n\nBugs fixed:" >> ChangeLog -cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +echo -e "\n\nBugs fixed:" >> ${LOGNAME} +cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME} -echo -e "\n\nBugs opened:" >> ChangeLog -cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +echo -e "\n\nBugs opened:" >> ${LOGNAME} +cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME} -echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog +echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME} rm -Rf logs -- 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 d80119285dccdab5f0675dba9edad6a3637b0ccf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 16:29:26 +0000 Subject: add oh-puzzles, the Opened Hand Puzzles Collection (taken from Poky) --- packages/puzzles/oh-puzzles_svn.bb | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/puzzles/oh-puzzles_svn.bb diff --git a/packages/puzzles/oh-puzzles_svn.bb b/packages/puzzles/oh-puzzles_svn.bb new file mode 100644 index 0000000000..85d742ce90 --- /dev/null +++ b/packages/puzzles/oh-puzzles_svn.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "Portable Puzzle Collection" +LICENSE = "MIT" +SECTION = "x11" +DEPENDS = "gtk+ gconf intltool-native librsvg" +PV = "0.1+svn${SRCDATE}" +PR = "r4" + +inherit autotools pkgconfig + +SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http" +S = "${WORKDIR}/${PN}" + +do_install_append () { + mv ${D}${bindir} ${D}/usr/games + + install -d ${D}/${datadir}/applications/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + # Convert prog to Title Case + title=$(echo $prog | sed 's/\(^\| \)./\U&/g') + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat < ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$title +Exec=${prefix}/games/$prog +Icon=applications-games +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +Comment=Play $title. +STOP + fi + done +} + +FILES_${PN} += "${prefix}/games/*" +FILES_${PN}-dbg += "${prefix}/games/.debug/*" + -- cgit v1.2.3 From 10a0258d4751e5e84adcc531f39dc365ae19ab03 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 16:33:23 +0000 Subject: openmoko2: * prepare for SVNREV * add openmoko-calculator2 --- classes/openmoko2.bbclass | 3 +++ packages/openmoko2/libmokogsmd2_svn.bb | 2 +- packages/openmoko2/libmokojournal2_svn.bb | 2 +- packages/openmoko2/libmokopanelui2_svn.bb | 2 +- packages/openmoko2/libmokoui2_svn.bb | 2 +- packages/openmoko2/openmoko-calculator2_svn.bb | 7 +++++++ packages/openmoko2/openmoko-contacts2_svn.bb | 4 ++-- packages/openmoko2/openmoko-dialer2_svn.bb | 2 +- packages/openmoko2/openmoko-feedreader2_svn.bb | 8 +++----- packages/openmoko2/openmoko-icon-theme-standard_svn.bb | 2 +- packages/openmoko2/openmoko-theme-standard2_svn.bb | 2 +- packages/openmoko2/openmoko-today2_svn.bb | 3 +-- 12 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 packages/openmoko2/openmoko-calculator2_svn.bb diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 4675b6a10e..bf5e1da6b8 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -26,3 +26,6 @@ SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=$ S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" + +# until we have SRCREV computing +SRCREV ?= "0${SRCDATE}" diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb index 8fe54f3348..8e547b3663 100644 --- a/packages/openmoko2/libmokogsmd2_svn.bb +++ b/packages/openmoko2/libmokogsmd2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb index e5a1fe74f8..90f93074ac 100644 --- a/packages/openmoko2/libmokojournal2_svn.bb +++ b/packages/openmoko2/libmokojournal2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "eds-dbus" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb index c76729e619..54fe73c6bd 100644 --- a/packages/openmoko2/libmokopanelui2_svn.bb +++ b/packages/openmoko2/libmokopanelui2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb index f818578c21..6042f67e0a 100644 --- a/packages/openmoko2/libmokoui2_svn.bb +++ b/packages/openmoko2/libmokoui2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb new file mode 100644 index 0000000000..8e0c9ad6da --- /dev/null +++ b/packages/openmoko2/openmoko-calculator2_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "A Calculator for OpenMoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb index e44f387fc7..72bbc8517c 100644 --- a/packages/openmoko2/openmoko-contacts2_svn.bb +++ b/packages/openmoko2/openmoko-contacts2_svn.bb @@ -1,12 +1,12 @@ DESCRIPTION = "The OpenMoko address book" SECTION = "openmoko/pim" RDEPENDS = "libedata-book" -PV = "0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r2" inherit openmoko2 -SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http" S = "${WORKDIR}/hito/" EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko" diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index ccbd6f8775..08ef166ee1 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 41f28ed6a1..eed51d1cd6 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,9 +1,7 @@ -DESCRIPTION = "The OpenMoko RSS Reader" -SECTION = "openmoko/applications" +DESCRIPTION = "The OpenMoko Feed Reader" +SECTION = "openmoko/apps" DEPENDS += "libmrss check webkit" - -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r0" inherit openmoko2 - diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb index 8029e1fbc9..dc88d14ba5 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svn${SRCREV}" PR = "r1" inherit openmoko-base autotools diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb index ed707a9617..a5f3108093 100644 --- a/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCDATE}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index a38be614f4..94ea147b87 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,7 +1,6 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm" - -PV = "0.1.0+srvn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko2 gtk-icon-cache -- cgit v1.2.3 From 2df222c14d8171541f1a2eda5cf19ced7a19df9a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 16:36:09 +0000 Subject: task-openmoko: add games, add calculator, remove panel-mainmenu --- packages/tasks/task-openmoko.bb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 6ac888c55a..814f4948ba 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r50" +PR = "r52" ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" @@ -12,11 +12,10 @@ PACKAGES = "\ task-openmoko-ui \ task-openmoko-base \ task-openmoko-phone \ - task-openmoko-finger \ task-openmoko-pim \ task-openmoko-net \ \ - task-openmoko-demo \ + task-openmoko-games \ task-openmoko-examples \ task-openmoko-debug \ task-openmoko-native-sdk \ @@ -86,6 +85,7 @@ RDEPENDS_task-openmoko-base = "\ matchbox-keyboard \ matchbox-stroke \ openmoko-keyboard \ +# openmoko-panel-mainmenu \ openmoko-panel-battery \ openmoko-panel-bt \ openmoko-panel-clock \ @@ -105,20 +105,13 @@ RDEPENDS_task-openmoko-phone = "\ # ppp \ " -# -# task-openmoko-finger -# -DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications" -RDEPENDS_task-openmoko-finger = "\ -# openmoko-calculator \ -" - # # task-openmoko-pim # DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications" RDEPENDS_task-openmoko-pim = "\ eds-dbus \ + openmoko-calculator2 \ openmoko-contacts2 \ openmoko-today2 \ # openmoko-messages \ @@ -134,6 +127,14 @@ RDEPENDS_task-openmoko-net = "\ bridge-utils \ " +# +# task-openmoko-games +# +DESCRIPTION_task-openmoko-games = "OpenMoko: Games" +RDEPENDS_task-openmoko-games = "\ + oh-puzzles \ +" + # # task-openmoko-debug # -- cgit v1.2.3 From 56c92c2ec5451ec270e01e646c06d63708e3c619 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 16:36:30 +0000 Subject: openmoko-panel-plugins: prepare for SVNREV --- .../openmoko-panel-plugins/openmoko-panel-battery_svn.bb | 2 +- packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb | 2 +- packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb | 2 +- packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb | 2 +- packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb | 12 ++++-------- .../openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb | 2 +- packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb index c9dd8c4817..0ec2f1e448 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel" DEPENDS = "apmd" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko-panel-plugin diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb index 786c2de657..97667159b5 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel" DEPENDS = "bluez-libs" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko-panel-plugin diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb index 389a6f2691..578c85d2a7 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Shows the current time in the OpenMoko panel" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko-panel-plugin diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb index 8002a05fc4..4ca9543424 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the GPS status in the OpenMoko panel" DEPENDS = "gpsd" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko-panel-plugin diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb index 6170da7c0c..e6888ee39b 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb @@ -1,10 +1,6 @@ -DESCRIPTION = "Shows the GSM status in the OpenMoko panel" -PV = "0.0.1+svn${SRCDATE}" -PR = "r1" - -DEPENDS_append = " libgsmd" +DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel" +DEPENDS = "libgsmd" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" inherit openmoko-panel-plugin - -FILES_${PN} += "${bindir}/${PN}" - diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb index cc5d6c48d3..bc5c60a381 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Main menu applet for the OpenMoko panel" DEPENDS += "pulseaudio startup-notification" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko-panel-plugin diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb index 8dc478c40b..cd7fbe1c46 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "USB applet for the OpenMoko panel" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.1.0+svnr${SRCREV}" inherit openmoko-panel-plugin -- cgit v1.2.3 From 582cafc92e1ffc1c3382a3aa119f5c517e7b612c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 20:09:42 +0000 Subject: add libowl (OpenedHand Widget Library) [taken from poky] --- packages/libowl/.mtn2git_empty | 0 packages/libowl/libowl_svn.bb | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 packages/libowl/.mtn2git_empty create mode 100644 packages/libowl/libowl_svn.bb diff --git a/packages/libowl/.mtn2git_empty b/packages/libowl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb new file mode 100644 index 0000000000..2126e3d4d0 --- /dev/null +++ b/packages/libowl/libowl_svn.bb @@ -0,0 +1,48 @@ +# This recipe builds libowl and then stages the header and static lib; +# it intentionally does not stage the shared lib and create a package. +# +# Libowl is currently a 'cut and paste' library; this package makes our +# life a touch easier by not having to patch the source directly into +# applications; instead we add -lowl to the linker cmdline. Also, when +# we eventually make libowl into a normal shared library, this package +# will make that transition rather simple. + +DESCRIPTION = "OpenedHand Widget Library" +HOMEPAGE = "http://www.o-hand.com" +LICENSE = "LGPL" +SECTION = "libs" +PR = "r3" +PV = "0.0+svn${SRCDATE}" + +DEPENDS = "gtk+ glib-2.0" +PACKAGES = "" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +do_compile_prepend() { + # have to unstage the library first so that the tests build + rm -f ${STAGING_LIBDIR}/libowl* + rm -f ${STAGING_INCDIR}/owl* +} + +do_stage() { + headers=`eval ls libowl/owl*.h` + for header in $headers; do + hdr_base=`eval basename $header` + install -m 644 $header ${STAGING_INCDIR}/$hdr_base + done + install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/ +} + +do_install() { +} + +do_package() { +} + +do_package_write() { +} -- cgit v1.2.3 From de7ec2487e46e7ff12950717d7e575c6b8301c96 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 20:10:18 +0000 Subject: oh-puzzles: add libowl to dependencies [should be done in poky as well] --- packages/puzzles/oh-puzzles_svn.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/puzzles/oh-puzzles_svn.bb b/packages/puzzles/oh-puzzles_svn.bb index 85d742ce90..67643cb281 100644 --- a/packages/puzzles/oh-puzzles_svn.bb +++ b/packages/puzzles/oh-puzzles_svn.bb @@ -1,16 +1,16 @@ DESCRIPTION = "Portable Puzzle Collection" LICENSE = "MIT" SECTION = "x11" -DEPENDS = "gtk+ gconf intltool-native librsvg" +DEPENDS = "gtk+ gconf intltool-native librsvg libowl" PV = "0.1+svn${SRCDATE}" -PR = "r4" +PR = "r5" inherit autotools pkgconfig SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http" S = "${WORKDIR}/${PN}" -do_install_append () { +do_install_append() { mv ${D}${bindir} ${D}/usr/games install -d ${D}/${datadir}/applications/ -- 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 From a26a9fc2d2158f4881adf3b3511aa951fc27a8b9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 23:46:06 +0000 Subject: webkit: clean up (guys, please don't mix TABs and SPACEs) and make it build --- packages/webkit/webkit_svn.bb | 63 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index c5f5dcafa7..8a6480d54f 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -4,38 +4,37 @@ DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qm PV = "0.0+svn${SRCDATE}" PR = "r1" -inherit qmake pkgconfig +inherit qmake qt4x11 pkgconfig SRC_URI = "\ - svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ - svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ - svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \ - svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \ - svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ -# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \ - svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ - file://Makefile \ - file://Makefile.shared \ - file://WebKit.pri \ - file://WebKit.pro \ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ +# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://WebKit.pri \ + file://WebKit.pro \ " - S = "${WORKDIR}/" - do_configure_append() { - qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug + qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug mkdir -p WebKitBuilds/Debug cd WebKitBuilds/Debug - PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} + PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \ + WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} } do_compile_prepend() { - mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ - cd ${S}/JavaScriptCore/pcre - ${BUILD_CC} dftables.c -o dftables -I. -I../wtf - cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ - cd ${S}/WebKitBuilds/Debug + mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cd ${S}/JavaScriptCore/pcre + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cd ${S}/WebKitBuilds/Debug } do_install() { @@ -44,24 +43,22 @@ do_install() { install -d ${D}${libdir}/pkgconfig install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir} - cd ${S}/WebKitBuilds/Debug - PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} - oe_runmake install + cd ${S}/WebKitBuilds/Debug + PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \ + WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} + oe_runmake install } - do_stage() { - install -d ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR} - cd ${S}/WebKitBuilds/Debug - PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} - oe_runmake install + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} + cd ${S}/WebKitBuilds/Debug + PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \ + WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} + oe_runmake install } PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher" FILES_webkit-gdklauncher = "${bindir}/GdkLauncher" FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher" - - - -- cgit v1.2.3