[oe-commits] org.oe.dev merge of '2a8702db4281b5dc1be59182ca755ae0bac6b5fa'

[oe commit]

merge of '2a8702db4281b5dc1be59182ca755ae0bac6b5fa'
     and 'c7d0711a18c512a5aa6f7085793a18d0849cf9d2'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e4fc6e6cf8de887e35a9956fe6d63346dab4cdea
ViewMTN: http://monotone.openembedded.org/revision/info/e4fc6e6cf8de887e35a9956fe6d63346dab4cdea
Files:
1
packages/tasks/task-openmoko-feed.bb
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/illume-theme-freesmartphone_git.bb
Diffs:

#
# mt diff -r2a8702db4281b5dc1be59182ca755ae0bac6b5fa -re4fc6e6cf8de887e35a9956fe6d63346dab4cdea
#
#
#
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [0bf2b02153069dc9396529954a302ff35d2204eb]
#    to [b70d0fc4a17c8e55bd27e714099e1cca24735777]
#
============================================================
--- packages/tasks/task-openmoko-feed.bb	0bf2b02153069dc9396529954a302ff35d2204eb
+++ packages/tasks/task-openmoko-feed.bb	b70d0fc4a17c8e55bd27e714099e1cca24735777
@@ -16,22 +16,19 @@ RDEPENDS_task-openmoko-feed = "\
   eet evas ecore embryo epsilon edje efreet emotion epdf \
   exhibit edje-viewer \
   free42-vga \
-  git \
   gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
   ipkg-link ipkg-utils \
   joe \
   kbdd \
   kexec-tools \
-  libnotify \
   midori \
   mplayer \
   mtpaint \
   mysql \
-  nano navit \
-  notification-daemon \
+  nano \
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
-  python python-pygtk python-pyserial \
+  python python-pygtk python-pyserial python-gst \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \
@@ -41,18 +38,51 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
+#  libswt3.4-gtk-java \
+#  cacao \
+#  jamvm \
+#  classpath \
   gpsdrive \
   asterisk \
+#  gnash \
   mono \
   diversity-daemon \
   diversity-nav \
   diversity-maps-taipei \
+#  om-maps-berlin \
+#  om-maps-buenos-aires \
+#  om-maps-london \
+#  om-maps-new-york \
+#  om-maps-paris \
+#  om-maps-providence \
+#  om-maps-san-francisco \
+#  om-maps-sydney \
+#  om-maps-taipei \
+#  om-settings \
   assassin \
+#  assassin-thumbnail \
   tangogps \
-\
-  libswt3.4-gtk-java \
-  cacao \
-  jamvm \
-  classpath \
-  gnash \
+#  pyefl-sudoku \
+  minicom \
+  vim \
+#  iotop \
+#  evince \
+  epdf \
+  xprop \
+  xev \
+  xwininfo \
+  gpsd \
+  mc \
+  devmem2 \
+  bluez-utils-alsa \
+  tcpdump \
+  gdb \
+  lsof \
+#  openmoko-set-root-password \
+#  qtopia-phone-enable-debug \
+  git \
+  navit \
+  libnotify \
+  notification-daemon \
+  u-boot-openmoko \
 "


#
# mt diff -rc7d0711a18c512a5aa6f7085793a18d0849cf9d2 -re4fc6e6cf8de887e35a9956fe6d63346dab4cdea
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [cdfb6041afd0978d8d16ce5bf7469f2b3b254eae]
#    to [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
# 
# patch "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
#  from [7d8251f9fa4e5a7357094ef5e02174512e643850]
#    to [4e2384d985f0f4aed6d613bd4e69a5509bd23665]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	cdfb6041afd0978d8d16ce5bf7469f2b3b254eae
+++ conf/distro/include/sane-srcrevs.inc	647a26cd30973ca6a2a668fa840c7bff50c53ae3
@@ -49,7 +49,7 @@ SRCREV_pn-illume-theme-asu ?= "170"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume ?= "170"
 SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "551dd7dc53f0eb167706e117f86f48378585a8c0"
+SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/freesmartphone/illume-theme-freesmartphone_git.bb	7d8251f9fa4e5a7357094ef5e02174512e643850
+++ packages/freesmartphone/illume-theme-freesmartphone_git.bb	4e2384d985f0f4aed6d613bd4e69a5509bd23665
@@ -1,8 +1,9 @@ LICENSE = "MIT/BSD"
 DESCRIPTION = "Illume theme for the freesmartphone.org project"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
+DEPENDS = "edje-native eet-native"
 PV = "0.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/illume"
@@ -10,18 +11,27 @@ do_compile() {
 do_compile() {
    cd illume && ./build.sh && cd ..
    cd illume_init && ./build.sh && cd ..
+   cd illume-config
+   eet -e e.cfg config e.src 1
+   eet -e module.battery.cfg config module.battery.src 1
+   eet -e module.illume.cfg config module.illume.src 1
 }
 
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
     install -d ${D}${datadir}/enlightenment/data/init/
+    install -d ${D}${datadir}/enlightenment/data/config/fso/
 
-    # Make illume the default profile
-    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+    # Make fso the default profile
+    echo 'E_PROFILE="-profile fso"' > ${D}${sysconfdir}/enlightenment/default_profile
 
-    install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+    install -m 0644 ${S}/illume/fso.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/illume_init/fso_init.edj ${D}${datadir}/enlightenment/data/init/
+    
+    install -m 0644 ${S}/illume-config/e.cfg ${D}${datadir}/enlightenment/data/config/fso/
+    install -m 0644 ${S}/illume-config/module.battery.cfg ${D}${datadir}/enlightenment/data/config/fso/
+    install -m 0644 ${S}/illume-config/module.illume.cfg ${D}${datadir}/enlightenment/data/config/fso/
 }
 
 RPROVIDES_${PN} = "illume-theme"