[oe-commits] org.oe.dev merge of '1eda447bcdb08adfa9f20f565bd08e963be86a92'

Tue Dec 18 17:34:33 UTC 2007

merge of '1eda447bcdb08adfa9f20f565bd08e963be86a92'
     and 'b98706e643fe20b21c34102738a4ce726bc5fb60'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: eae950ac7860db142942252d261d665e31150f2d
ViewMTN: http://monotone.openembedded.org/revision/info/eae950ac7860db142942252d261d665e31150f2d
Files:
1
conf/bitbake.conf
packages/matchbox-desktop-sato
packages/matchbox-sato
packages/matchbox-sato/matchbox-sato
packages/matchbox-sato/matchbox-sato/etc
packages/matchbox-sato/matchbox-sato/etc/matchbox
packages/gtk-webcore/midori_0.0.15.bb
packages/images/poky-base-image.bb
packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
packages/matchbox-sato/matchbox-sato/etc/matchbox/session
packages/matchbox-sato/matchbox-sato/matchbox-session
packages/matchbox-sato/matchbox-sato_0.1.bb
mtn:execute
true
Diffs:

#
# mt diff -r1eda447bcdb08adfa9f20f565bd08e963be86a92 -reae950ac7860db142942252d261d665e31150f2d
#
# 
# 
# patch "conf/bitbake.conf"
#  from [b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5]
#    to [5044eed5572b1c9c12c31cf7952ccedc1648524c]
# 
============================================================

--- conf/bitbake.conf	b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5
+++ conf/bitbake.conf	5044eed5572b1c9c12c31cf7952ccedc1648524c
@@ -82,7 +82,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}"
 HOST_PREFIX = "${TARGET_PREFIX}"
 HOST_CC_ARCH = "${TARGET_CC_ARCH}"
 
-TARGET_ARCH = "INVALID"
+TARGET_ARCH ?= "INVALID"
 TARGET_OS = "INVALID"
 TARGET_VENDOR = "${BUILD_VENDOR}"
 TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"


#
# mt diff -rb98706e643fe20b21c34102738a4ce726bc5fb60 -reae950ac7860db142942252d261d665e31150f2d
#
# 
# 
# add_dir "packages/matchbox-desktop-sato"
# 
# add_dir "packages/matchbox-sato"
# 
# add_dir "packages/matchbox-sato/matchbox-sato"
# 
# add_dir "packages/matchbox-sato/matchbox-sato/etc"
# 
# add_dir "packages/matchbox-sato/matchbox-sato/etc/matchbox"
# 
# add_file "packages/gtk-webcore/midori_0.0.15.bb"
#  content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
# 
# add_file "packages/images/poky-base-image.bb"
#  content [66c0c8137141d9eba661ea645f864e06f05e045c]
# 
# add_file "packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb"
#  content [d2039393304243c5b1fc3bd6c8d7827bb9c137b6]
# 
# add_file "packages/matchbox-sato/matchbox-sato/etc/matchbox/session"
#  content [7c060152ca65e683966e2376067c55b8e71582e2]
# 
# add_file "packages/matchbox-sato/matchbox-sato/matchbox-session"
#  content [c32dbae334b8f44e316abb4125fc51398d09f80e]
# 
# add_file "packages/matchbox-sato/matchbox-sato_0.1.bb"
#  content [0408c12a10eb5270db838eaa7093e5ce16b1679e]
# 
#   set "packages/matchbox-sato/matchbox-sato/etc/matchbox/session"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/gtk-webcore/midori_0.0.15.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.15.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
============================================================
--- packages/images/poky-base-image.bb	66c0c8137141d9eba661ea645f864e06f05e045c
+++ packages/images/poky-base-image.bb	66c0c8137141d9eba661ea645f864e06f05e045c
@@ -0,0 +1,29 @@
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+IMAGE_INSTALL = "\
+	task-base-extended \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	pointercal \
+	matchbox-wm \
+	matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \
+	matchbox-desktop \
+	${XSERVER} \
+	xserver-kdrive-common xserver-nodm-init \
+	ttf-liberation \
+	xauth xhost xset xrandr \
+	matchbox-sato \
+	matchbox-config-gtk \
+	matchbox-themes-gtk \
+	matchbox-applet-startup-monitor \
+	xcursor-transparent-theme \
+	sato-icon-theme \
+	settings-daemon \
+"
+
+export IMAGE_BASENAME = "poky-base-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
============================================================
--- packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb	d2039393304243c5b1fc3bd6c8d7827bb9c137b6
+++ packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb	d2039393304243c5b1fc3bd6c8d7827bb9c137b6
@@ -0,0 +1,14 @@
+SECTION = "x11"
+DESCRIPTION = "Sato desktop folders"
+LICENSE = "LGPL"
+DEPENDS = ""
+CONFLICTS = "matchbox-common"
+SRCREV = "76"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http"
+S = "${WORKDIR}/desktop-folders"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/matchbox-sato/matchbox-sato/etc/matchbox/session	7c060152ca65e683966e2376067c55b8e71582e2
+++ packages/matchbox-sato/matchbox-sato/etc/matchbox/session	7c060152ca65e683966e2376067c55b8e71582e2
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+if [ -e /dev/touchscreen/touchscreen0 ]; then
+    SHOWCURSOR="no"
+else
+    SHOWCURSOR="yes"
+fi
+
+matchbox-desktop &
+
+matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup &
+
+exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
============================================================
--- packages/matchbox-sato/matchbox-sato/matchbox-session	c32dbae334b8f44e316abb4125fc51398d09f80e
+++ packages/matchbox-sato/matchbox-sato/matchbox-session	c32dbae334b8f44e316abb4125fc51398d09f80e
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1 
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist. 
+
+matchbox-desktop &
+matchbox-panel  --orientation south &
+exec matchbox-window-manager $@
============================================================
--- packages/matchbox-sato/matchbox-sato_0.1.bb	0408c12a10eb5270db838eaa7093e5ce16b1679e
+++ packages/matchbox-sato/matchbox-sato_0.1.bb	0408c12a10eb5270db838eaa7093e5ce16b1679e
@@ -0,0 +1,29 @@
+DESCRIPTION = "Custom MB session files for poky"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
+RCONFLICTS = "matchbox-common"
+PR = "r17"
+
+SRC_URI = "file://etc file://matchbox-session"
+S = ${WORKDIR}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/matchbox/.svn
+	chmod -R 755 ${D}/etc
+}
+
+pkg_postinst_matchbox-sato () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
+}




