[oe-commits] org.oe.dev merge of '2dba387308c2873b665bd04502559a10e5fe59c0'
pfalcon commit
openembedded-commits at lists.openembedded.org
Wed Dec 19 08:13:43 UTC 2007
merge of '2dba387308c2873b665bd04502559a10e5fe59c0'
and '3a104d2a86c0e7a130667498d91801495e6ee27d'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5968fdd70fe297abea7dae6b5ada03014e1c4e37
ViewMTN: http://monotone.openembedded.org/revision/info/5968fdd70fe297abea7dae6b5ada03014e1c4e37
Files:
1
packages/libxml/files/no-testapi.patch
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/avahi/avahi_0.6.22.bb
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
conf/distro/angstrom-2008.1.conf
contrib/angstrom/build-release.sh
packages/avahi/avahi.inc
mtn:execute
true
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r2dba387308c2873b665bd04502559a10e5fe59c0 -r5968fdd70fe297abea7dae6b5ada03014e1c4e37
#
#
#
# delete "packages/libxml/files/no-testapi.patch"
#
# 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/avahi/avahi_0.6.22.bb"
# content [f286a6ffada3390d2b72ee15d958159d8547d3b1]
#
# 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]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [48eeeef2da4e7f0a0dd6bb78271647732c326f66]
# to [71653d68abac9cadecd9c4f46a1cfadaff2d3f11]
#
# patch "contrib/angstrom/build-release.sh"
# from [fcbcc35a1bbbe58855952cff9065301b196efa1a]
# to [f2199cfa4af0b86c2d7bf508cb53516c468b13f5]
#
# patch "packages/avahi/avahi.inc"
# from [caffb4223742bd86a6d49f717b86d9172d22e5e6]
# to [301235b5768fb7ab4d745a6a87896f738baadc10]
#
# set "packages/matchbox-sato/matchbox-sato/etc/matchbox/session"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/avahi/avahi_0.6.22.bb f286a6ffada3390d2b72ee15d958159d8547d3b1
+++ packages/avahi/avahi_0.6.22.bb f286a6ffada3390d2b72ee15d958159d8547d3b1
@@ -0,0 +1,5 @@
+require avahi.inc
+
+DEPENDS += "intltool-native"
+
+PACKAGES =+ "libavahi-gobject"
============================================================
--- 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"
+}
============================================================
--- conf/distro/angstrom-2008.1.conf 48eeeef2da4e7f0a0dd6bb78271647732c326f66
+++ conf/distro/angstrom-2008.1.conf 71653d68abac9cadecd9c4f46a1cfadaff2d3f11
@@ -35,14 +35,6 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
-FEED_URIS += " \
- no-arch##${ANGSTROM_URI}/unstable/feed/all \
- base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
- perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
- python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
- debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
- gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
- ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
# set feed path variables
FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
@@ -61,7 +53,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
@@ -182,7 +174,7 @@ DISTRO_EXTRA_RDEPENDS += "\
update-modules \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
- ipkg ipkg-collateral \
+ ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
util-linux-mount util-linux-umount \
${DEBUG_APPS} \
"
============================================================
--- contrib/angstrom/build-release.sh fcbcc35a1bbbe58855952cff9065301b196efa1a
+++ contrib/angstrom/build-release.sh f2199cfa4af0b86c2d7bf508cb53516c468b13f5
@@ -32,17 +32,28 @@ do_report_success() {
echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log
}
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+# BUILD_MACHINE=$machine
+# BUILD_TARGETS="meta-toolchain"
+# BUILD_CLEAN="meta-toolchain"
+# do_build
+#done
+
+
# No graphics
for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
do
BUILD_MACHINE=$machine
- BUILD_CLEAN="libtool-cross"
+ BUILD_CLEAN="libtool-cross base-files"
BUILD_TARGETS="base-image console-image"
do_build
done
for machine in ixp4xxle ixp4xxbe
do
+ BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
BUILD_TARGETS="base-image nslu2-base-image"
do_build
@@ -51,6 +62,7 @@ do
# build altboot images for zaurus
for machine in c7x0 poodle tosa akita spitz collie
do
+ BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
BUILD_TARGETS="altboot-console-image"
do_build
@@ -59,6 +71,7 @@ do
# graphics, flash storage
for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie
do
+ BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
do_build
@@ -67,6 +80,7 @@ do
# graphics, disk storage
for machine in spitz
do
+ BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image"
do_build
@@ -88,12 +102,3 @@ done
do_build
done
-#cross toolchain
-#for machine in ep93xx a780 efika collie ixp4xxbe
-#do
-# BUILD_MACHINE=$machine
-# BUILD_TARGETS="meta-toolchain"
-# BUILD_CLEAN="meta-toolchain"
-# do_build
-#done
-
============================================================
--- packages/avahi/avahi.inc caffb4223742bd86a6d49f717b86d9172d22e5e6
+++ packages/avahi/avahi.inc 301235b5768fb7ab4d745a6a87896f738baadc10
@@ -45,10 +45,11 @@ FILES_libavahi-glib = "${libdir}/libavah
${sysconfdir}/avahi/avahi-dnsconfd.action \
${sysconfdir}/init.d/avahi-dnsconfd"
FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
FILES_avahi-utils = "${bindir}/avahi-*"
FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
${sysconfdir}/avahi/avahi-autoipd.action \
- ${sysconfdir}/udhcpc.d/*avahi-autoipd"
+ ${sysconfdir}/udhcpc.d/*avahi-autoipd"
FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
FILES_avahi-discover = "${bindir}/avahi-discover \
${datadir}/applications/avahi-discover.desktop \
#
# mt diff -r3a104d2a86c0e7a130667498d91801495e6ee27d -r5968fdd70fe297abea7dae6b5ada03014e1c4e37
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [27fb03e6e272d6cbc1b97489f33e1e076ac5625b]
# to [edfade99b01acbfb856f3c07d7657e47238313d7]
#
============================================================
--- conf/distro/angstrom-2007.1.conf 27fb03e6e272d6cbc1b97489f33e1e076ac5625b
+++ conf/distro/angstrom-2007.1.conf edfade99b01acbfb856f3c07d7657e47238313d7
@@ -8,7 +8,7 @@ DISTRO_VERSION = "2007.11RC1.2"
# The release will the 2007.12
DISTRO_VERSION = "2007.11RC1.2"
-DISTRO_REVISION = "49"
+DISTRO_REVISION = "50"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
@@ -60,7 +60,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
More information about the Openembedded-commits
mailing list