org.openmoko.april-update: da6f03f7ffef7e70768f390c5be2327d83ea51c1

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 16 16:36:38 CEST 2008


revision:            da6f03f7ffef7e70768f390c5be2327d83ea51c1
date:                2008-05-16T08:15:09
author:              freyther at openembedded.org
branch:              org.openmoko.april-update
changelog:
merge of '49de21e9c145baf25b797bb8f1c1c930c0071d5b'
     and '94249c357fa09584290f9a396c40981a6bb6066a'

manifest:
format_version "1"

new_manifest [febfb25f6905182b65bec3c82cc69cb12522997c]

old_revision [49de21e9c145baf25b797bb8f1c1c930c0071d5b]

add_file "classes/om-utils.bbclass"
 content [a2d8a98660fedee362fc8da5628f26077268540a]

patch "conf/distro/include/sane-srcrevs.inc"
 from [db6d3f9edf0113be473b7ca0655c8231d60d432a]
   to [560afdc8beb0d2e818de3abf31d54cbd01b876cd]

patch "packages/efl1/epsilon_cvs.bb"
 from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
   to [17cdd9bae3d37e28856c52115c8249de46b9188f]

patch "packages/openmoko-projects/illume-theme_svn.bb"
 from [59cae986e3e5bcdc70e846e805959f7e314d8e59]
   to [a5b248c743b547dd436dd3ee40850b98a7f125e6]

patch "packages/openmoko-projects/illume_svn.bb"
 from [9464d26b8d3a26fa754680912954af89c3a60349]
   to [66708cb62acecffd8b209d19e26f409da72d6108]

old_revision [94249c357fa09584290f9a396c40981a6bb6066a]

patch "conf/distro/include/sane-srcrevs.inc"
 from [dd436041bb8317b26c1b392996f01810d45d5ca1]
   to [560afdc8beb0d2e818de3abf31d54cbd01b876cd]

patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
 from [90cdf355478c7b32a02d454bbdd3f78ab2a51eb8]
   to [5d6353e7386221d1c5f4f9e45b1b5e65217e13c8]
-------------- next part --------------
#
#
# add_file "classes/om-utils.bbclass"
#  content [a2d8a98660fedee362fc8da5628f26077268540a]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [db6d3f9edf0113be473b7ca0655c8231d60d432a]
#    to [560afdc8beb0d2e818de3abf31d54cbd01b876cd]
# 
# patch "packages/efl1/epsilon_cvs.bb"
#  from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
#    to [17cdd9bae3d37e28856c52115c8249de46b9188f]
# 
# patch "packages/openmoko-projects/illume-theme_svn.bb"
#  from [59cae986e3e5bcdc70e846e805959f7e314d8e59]
#    to [a5b248c743b547dd436dd3ee40850b98a7f125e6]
# 
# patch "packages/openmoko-projects/illume_svn.bb"
#  from [9464d26b8d3a26fa754680912954af89c3a60349]
#    to [66708cb62acecffd8b209d19e26f409da72d6108]
#
============================================================
--- classes/om-utils.bbclass	a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass	a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+	import sys
+
+	localdata = bb.data.createCopy(d)
+	bb.data.update_data(localdata)
+
+	workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+	print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+	workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
============================================================
--- conf/distro/include/sane-srcrevs.inc	db6d3f9edf0113be473b7ca0655c8231d60d432a
+++ conf/distro/include/sane-srcrevs.inc	560afdc8beb0d2e818de3abf31d54cbd01b876cd
@@ -42,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "71"
-SRCREV_pn-illume-theme ?= "71"
+SRCREV_pn-illume ?= "76"
+SRCREV_pn-illume-theme ?= "76"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -64,7 +64,7 @@ SRCREV_pn-linux-ixp4xx ?= "1062"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1062"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
+SRCREV_pn-linux-openmoko ?= "927c22fef4b386a419b0ac684815881a7d489775"
 SRCREV_pn-linux-openmoko-devel ?= "29ab5ca74817b1f045b4c160c687750548b54659"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- packages/efl1/epsilon_cvs.bb	06a4ccc0ac1208566731c847fc2ac20246de3ec5
+++ packages/efl1/epsilon_cvs.bb	17cdd9bae3d37e28856c52115c8249de46b9188f
@@ -4,11 +4,11 @@ PV = "0.3.0.012+cvs${SRCDATE}"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
-SRC_URI += "file://fix_alignment_error.patch;patch=1"
+SRC_URI += "file://fix_alignment_error.patch;patch=1;maxdate=20080511"
 
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	59cae986e3e5bcdc70e846e805959f7e314d8e59
+++ packages/openmoko-projects/illume-theme_svn.bb	a5b248c743b547dd436dd3ee40850b98a7f125e6
@@ -4,35 +4,20 @@ PV = "0.0+svnr${SRCPV}"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
 S = "${WORKDIR}/illume"
 
-python do_unpack_append() {
-	bb.note("Unpacking to %s" % os.getcwd())
-
-	# support both pre and post r71 illume theme files
-	if os.path.exists("illume/misc-data/untar-me-from-root.tar.gz"):
-	    os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz")
-	elif os.path.exists("illume/misc-data/illume-cfg.tar.gz"):
-	    os.system("cd illume; tar -xz --no-same-owner -f misc-data/illume-cfg.tar.gz")
-	else:
-	    assert False
-}
-
 CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
 FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
 
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
-    install -d ${D}${datadir}/enlightenment/data/config/
 
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
     install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    cp -pPR ${S}/.e/e/config/default ${D}${datadir}/enlightenment/data/config/illume || true
-    cp -pPR ${S}/.e/e/config/illume  ${D}${datadir}/enlightenment/data/config/illume || true
 }
============================================================
--- packages/openmoko-projects/illume_svn.bb	9464d26b8d3a26fa754680912954af89c3a60349
+++ packages/openmoko-projects/illume_svn.bb	66708cb62acecffd8b209d19e26f409da72d6108
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCPV}"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
            file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
@@ -21,5 +21,6 @@ FILES_${PN} = "${libdir}/enlightenment/m
 FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
                ${libdir}/enlightenment/modules/*/*.desktop \
                ${libdir}/enlightenment/modules/*/*/* \
+               ${datadir}/enlightenment/data/config/*/* \
                ${datadir}/${PN} "
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080516/252e160c/attachment.htm 
-------------- next part --------------
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [dd436041bb8317b26c1b392996f01810d45d5ca1]
#    to [560afdc8beb0d2e818de3abf31d54cbd01b876cd]
# 
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  from [90cdf355478c7b32a02d454bbdd3f78ab2a51eb8]
#    to [5d6353e7386221d1c5f4f9e45b1b5e65217e13c8]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	dd436041bb8317b26c1b392996f01810d45d5ca1
+++ conf/distro/include/sane-srcrevs.inc	560afdc8beb0d2e818de3abf31d54cbd01b876cd
@@ -164,7 +164,7 @@ SRCREV_pn-python-pyrtc ?= "152"
 SRCREV_pn-python-gsmd ?= "148"
 SRCREV_pn-python-lightmediascanner ?= "68"
 SRCREV_pn-python-pyrtc ?= "152"
-SRCREV_pn-qtopia-phone-x11 ?= "341e1f0813d2b1044ca0fd2946b07d97733e2eaf"
+SRCREV_pn-qtopia-phone-x11 ?= "0fb340f0e9ebf775d0203219bed059caacda4424"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	90cdf355478c7b32a02d454bbdd3f78ab2a51eb8
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	5d6353e7386221d1c5f4f9e45b1b5e65217e13c8
@@ -27,7 +27,6 @@ SRC_URI = "git://git.openmoko.org/git/qt
 
 PR = "r14"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
-           http://people.openmoko.org/~graeme/qtopia/pixmaps.tar.gz \
            file://Xsession.d/89qtopia \
            file://qtopia.sh"
 
@@ -112,9 +111,7 @@ do_install() {
    ICONS=`cat ${S}/apps-fdo/*/*.desktop | grep Icon | cut -f 2 -d "="`
    for icon in $ICONS; do
       if [ -f "${S}/pics/$icon.svg" ] ; then
-#         imagemagick-native cant handle svg files
-#         convert -geometry 200x200 ${S}/pics/$icon.svg -gravity center -extent 600x200 ${S}/pics/$icon.png
-	 install -D ${WORKDIR}/pixmaps/$icon.png ${D}${datadir}/pixmaps/$icon.png
+	 install -D ${S}/pixmaps/$icon.png ${D}${datadir}/pixmaps/$icon.png
       fi
    done
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080516/252e160c/attachment-0001.htm 


More information about the commitlog mailing list