summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb21
-rw-r--r--packages/openmoko2/openmoko-session2.bb6
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
3 files changed, 24 insertions, 5 deletions
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
new file mode 100644
index 0000000000..11738f76f1
--- /dev/null
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Common files for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
+S = "${WORKDIR}"
+
+dirs = "pixmaps"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/openmoko/
+ for i in ${dirs}; do
+ cp -fpPR ${S}/$i ${D}${datadir}/openmoko/
+ done
+}
+
+FILES_${PN} = "${datadir}"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 1474cf7472..418993f079 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Custom MB session files for poky"
+DESCRIPTION = "Custom MB session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
-RDEPENDS+= "hsetroot openmoko-common2 openmoko-today2 openmoko-dialer2"
+RDEPENDS+= "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r27"
+PR = "r28"
SRC_URI = "file://etc"
S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 3087cb9709..b2867047b1 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,8 +1,6 @@
#!/bin/sh
SHOWCURSOR="no"
-hsetroot -center /usr/share/pixmaps/booting.png
-
openmoko-today &
openmoko-dialer &