[oe-commits] org.oe.dev merge of '24b8202a233fbef98ec2f7f85d4702688c1b951d'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Oct 24 00:53:37 UTC 2007
merge of '24b8202a233fbef98ec2f7f85d4702688c1b951d'
and '2ebd940d98ad52f4e6d4972f53b6a358d0e845c5'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3c08ee728d08c7353d5bf6f79c2c549db74f468d
ViewMTN: http://monotone.openembedded.org/revision/info/3c08ee728d08c7353d5bf6f79c2c549db74f468d
Files:
1
packages/qt/qt4-x11-free-4.3.0
packages/qt/qt4-x11-free-4.3.2
packages/qt/qt4-x11-free_4.3.0.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qte/qtopia-core_4.3.1.bb
packages/qte/qtopia-core_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/machine/dht-walnut.conf
packages/binutils/binutils_2.16.bb
packages/openmoko2/openmoko-browser2_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/qmake/qmake2-native_2.10a.bb
packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/webkit/webkit.inc
packages/ltrace/ltrace_0.4.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/openmoko2/openmoko-session2.bb
Diffs:
#
# mt diff -r24b8202a233fbef98ec2f7f85d4702688c1b951d -r3c08ee728d08c7353d5bf6f79c2c549db74f468d
#
#
#
# rename "packages/qt/qt4-x11-free-4.3.0"
# to "packages/qt/qt4-x11-free-4.3.2"
#
# rename "packages/qt/qt4-x11-free_4.3.0.bb"
# to "packages/qt/qt4-x11-free_4.3.2.bb"
#
# rename "packages/qte/qtopia-core_4.3.1.bb"
# to "packages/qte/qtopia-core_4.3.2.bb"
#
# add_file "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# content [83b84a6976c32c4c094913143c9ed28a2b37c610]
#
# patch "conf/checksums.ini"
# from [75d2658af051ce6ee032da90880a92b443c0b2cf]
# to [78e9ab72ee5a554ef253871c127648c291eb7aca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed]
# to [0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7]
#
# patch "conf/machine/dht-walnut.conf"
# from [bb26cc95419c8f5c3a5b33db309f3dd223e684ae]
# to [dad757ccc4507d5be5901a6218ef81704c49261c]
#
# patch "packages/binutils/binutils_2.16.bb"
# from [e8f4d7f7221f84224deec02c960351b1cc143312]
# to [53c0cea1af6729f7fff1d4913c3d4a3f332ed7d2]
#
# patch "packages/openmoko2/openmoko-browser2_svn.bb"
# from [35087c2e9fd7de4a3ced04ece5e3cb9ab0fee2e5]
# to [839b63f7e98d45b834b3b9079b9cfaeabd2d80e0]
#
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
# from [f816912cedbb108acf2d6b970b26bed4d81e83f1]
# to [fd676189ac8d7f2371659d8a4e339a9de2088e17]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [ee62f0cd510bf9374ee05aecd30c84f2f88ce94d]
# to [4e99113b60782b4965c8f34d69ca62a338f36078]
#
# patch "packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch"
# from [c3afeaba18e291233ac487a7a527fffb07d2af3d]
# to [df1a4142fcb80ad473de37338a9f39993018ce92]
#
# patch "packages/qte/qtopia-core_4.3.2.bb"
# from [318931809588acb33cdc77b0acb027a9d326485c]
# to [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
#
# patch "packages/webkit/webkit-qt.inc"
# from [0d47aaa6f3b4850c8e35d881a2a71b271b6b589a]
# to [1e75c2b1f67c6626edb8f9754c73d92cd0152d1a]
#
# patch "packages/webkit/webkit-qt_svn.bb"
# from [8a7e0008b0321d228d80e15a433d3a8b60cd718c]
# to [cf3e31f4d11e142196490cbd0faf5942d102bc94]
#
# patch "packages/webkit/webkit-qtopia_svn.bb"
# from [fd38f04ea3408debdff8222ee61518c57420e507]
# to [03fe45bc1271170d30d12a7d3a2b54d0955974f3]
#
# patch "packages/webkit/webkit.inc"
# from [37dc3651ff08fde99eab8a8c58f1a4922d578ad1]
# to [79c94f59fcfca65105a65eb52f4bf24d076f2d1f]
#
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.2.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
+++ packages/uicmoc/uicmoc4-native_4.3.2.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -0,0 +1,60 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- conf/checksums.ini 75d2658af051ce6ee032da90880a92b443c0b2cf
+++ conf/checksums.ini 78e9ab72ee5a554ef253871c127648c291eb7aca
@@ -1286,6 +1286,10 @@ sha256=8fdbc7da376b22796879d6e3b756f71a8
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
+md5=70b729dd5dd8b2b432d685918e1971f1
+sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+
[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
md5=1f0193358e92559ec0f598b09ccbc0ec
sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7
@@ -326,6 +326,7 @@ PREFERRED_VERSION_exiv2 ?= "0.15"
PREFERRED_VERSION_evieext ?= "1.0.2"
PREFERRED_VERSION_evince ?= "2.20.0"
PREFERRED_VERSION_exiv2 ?= "0.15"
+PREFERRED_VERSION_exmap-console ?= "0.4.1"
PREFERRED_VERSION_exml ?= "cvs"
PREFERRED_VERSION_exo ?= "0.3.2"
PREFERRED_VERSION_expat ?= "2.0.0"
@@ -1616,7 +1617,7 @@ PREFERRED_VERSION_qt-x11-free-native ?=
PREFERRED_VERSION_qsvn ?= "0.3.0"
PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
PREFERRED_VERSION_qtplot ?= "0.2"
PREFERRED_VERSION_quagga ?= "0.99.8"
PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1892,7 +1893,7 @@ PREFERRED_VERSION_uicmoc3-native ?= "3.3
PREFERRED_VERSION_ufraw ?= "0.12"
PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.1"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
PREFERRED_VERSION_uim ?= "1.3.1"
PREFERRED_VERSION_uim-native ?= "1.3.1"
PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
============================================================
--- conf/machine/dht-walnut.conf bb26cc95419c8f5c3a5b33db309f3dd223e684ae
+++ conf/machine/dht-walnut.conf dad757ccc4507d5be5901a6218ef81704c49261c
@@ -13,7 +13,7 @@ TARGET_CPU = "405"
MACHINE_FEATURES = "kernel26 ext2"
TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.18"
+TARGET_FPU = "soft"
#don't try to access tty1
USE_VT = "0"
============================================================
--- packages/binutils/binutils_2.16.bb e8f4d7f7221f84224deec02c960351b1cc143312
+++ packages/binutils/binutils_2.16.bb 53c0cea1af6729f7fff1d4913c3d4a3f332ed7d2
@@ -1,20 +1,21 @@ SRC_URI = \
PR = "r8"
SRC_URI = \
- "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
+ "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
file://ld_makefile.patch;patch=1 \
file://better_file_error.patch;patch=1 \
file://signed_char_fix.patch;patch=1 \
file://binutils-2.16-objcopy-rename-errorcode.patch;patch=1 \
file://binutils-100_cflags_for_build.patch;patch=1"
-SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
-
# uclibc patches
SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1"
-# thumb support patches
+# arm thumb support patches
SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
+# powerpc patches
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+
require binutils.inc
============================================================
--- packages/openmoko2/openmoko-browser2_svn.bb 35087c2e9fd7de4a3ced04ece5e3cb9ab0fee2e5
+++ packages/openmoko2/openmoko-browser2_svn.bb 839b63f7e98d45b834b3b9079b9cfaeabd2d80e0
@@ -1,7 +1,7 @@ PV = "0.0.1+svnr${SRCREV}"
DESCRIPTION = "The OpenMoko Webbrowser"
SECTION = "openmoko/apps"
DEPENDS += "intltool libmokoui2 check webkit-gtk"
PV = "0.0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko2
============================================================
--- packages/openmoko2/openmoko-feedreader2_svn.bb f816912cedbb108acf2d6b970b26bed4d81e83f1
+++ packages/openmoko2/openmoko-feedreader2_svn.bb fd676189ac8d7f2371659d8a4e339a9de2088e17
@@ -1,7 +1,7 @@ PV = "0.0.1+svnr${SRCREV}"
DESCRIPTION = "The OpenMoko Feed Reader"
SECTION = "openmoko/apps"
DEPENDS += "libmokoui2 libmrss check webkit-gtk"
PV = "0.0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko2
============================================================
--- packages/qmake/qmake2-native_2.10a.bb ee62f0cd510bf9374ee05aecd30c84f2f88ce94d
+++ packages/qmake/qmake2-native_2.10a.bb 4e99113b60782b4965c8f34d69ca62a338f36078
@@ -1,11 +1,11 @@ LICENSE = "GPL"
DESCRIPTION = "TrollTech Makefile Generator"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
-QTVER = "qtopia-core-opensource-src-4.3.1"
+QTVER = "qtopia-core-opensource-src-4.3.2"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
============================================================
--- packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch c3afeaba18e291233ac487a7a527fffb07d2af3d
+++ packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch df1a4142fcb80ad473de37338a9f39993018ce92
@@ -7,11 +7,11 @@ Subject: [PATCH] cross compile
configure | 137 ++----------------------------------------------------------
1 files changed, 5 insertions(+), 132 deletions(-)
-diff --git a/configure b/configure
-index 6b3ccd2..b3c2a52 100755
---- a/configure
-+++ b/configure
-@@ -733,7 +733,7 @@ while [ "$#" -gt 0 ]; do
+Index: qt-x11-opensource-src-4.3.2/configure
+===================================================================
+--- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200
++++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200
+@@ -735,7 +735,7 @@
UNKNOWN_ARG=yes
fi
;;
@@ -20,7 +20,7 @@ index 6b3ccd2..b3c2a52 100755
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
-@@ -1109,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1124,9 @@
xplatform)
XPLATFORM="$VAL"
;;
@@ -30,7 +30,7 @@ index 6b3ccd2..b3c2a52 100755
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
-@@ -2092,137 +2095,7 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+@@ -2119,149 +2122,7 @@
echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
fi
@@ -116,7 +116,7 @@ index 6b3ccd2..b3c2a52 100755
- ARCH=i386
- ;;
- *:*:x86_64|*:*:amd64)
-- if [ "$PLATFORM" = "linux-g++-32" ]; then
+- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32 bit on 64-bit AMD 80x86 (i386)"
- fi
@@ -146,6 +146,18 @@ index 6b3ccd2..b3c2a52 100755
- fi
- ARCH=s390
- ;;
+- *:*:arm*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " ARM (arm)"
+- fi
+- ARCH=arm
+- ;;
+- Linux:*:sparc*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " Linux on SPARC"
+- fi
+- ARCH=sparc
+- ;;
- *:*:*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Trying '$UNAME_MACHINE'..."
@@ -169,6 +181,3 @@ index 6b3ccd2..b3c2a52 100755
if [ "$OPT_VERBOSE" = "yes" ]; then
echo "System architecture: '$ARCH'"
---
-1.5.0.7
-
============================================================
--- packages/qte/qtopia-core_4.3.1.bb 318931809588acb33cdc77b0acb027a9d326485c
+++ packages/qte/qtopia-core_4.3.2.bb 132f2ff144e5483dcf628cf56459ce7b81f52b0f
@@ -5,7 +5,7 @@ DEPENDS = "freetype tslib"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "freetype tslib"
-PR = "r1"
+PR = "r0"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
file://linux-oe-qmake.conf"
============================================================
--- packages/webkit/webkit-qt.inc 0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
+++ packages/webkit/webkit-qt.inc 1e75c2b1f67c6626edb8f9754c73d92cd0152d1a
@@ -1,9 +1,9 @@ WEBKIT_EXTRA_OPTIONS = ""
WEBKIT_PORT = "qt"
WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
-FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
-FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+FILES_${PN}launcher = "${bindir}/QtLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
require webkit.inc
============================================================
--- packages/webkit/webkit-qt_svn.bb 8a7e0008b0321d228d80e15a433d3a8b60cd718c
+++ packages/webkit/webkit-qt_svn.bb cf3e31f4d11e142196490cbd0faf5942d102bc94
@@ -1,2 +1,4 @@ inherit qt4x11
require webkit-qt.inc
inherit qt4x11
+
+PR = "r1"
============================================================
--- packages/webkit/webkit-qtopia_svn.bb fd38f04ea3408debdff8222ee61518c57420e507
+++ packages/webkit/webkit-qtopia_svn.bb 03fe45bc1271170d30d12a7d3a2b54d0955974f3
@@ -1,3 +1,4 @@
-BROKEN="1"
require webkit-qt.inc
inherit qtopia4core
+
+PR = "r1"
============================================================
--- packages/webkit/webkit.inc 37dc3651ff08fde99eab8a8c58f1a4922d578ad1
+++ packages/webkit/webkit.inc 79c94f59fcfca65105a65eb52f4bf24d076f2d1f
@@ -1,8 +1,8 @@ SRCREV_FORMAT = "webcore-rwebkit"
DEPENDS += "flex-native gperf-native perl-native sqlite3"
SRCREV_FORMAT = "webcore-rwebkit"
# Yes, this is wrong...
-PV = "0.0+svnr${SRCREV}"
+PV = "0.1+svnr${SRCREV}"
PR = "r1"
inherit qmake2 pkgconfig
#
# mt diff -r2ebd940d98ad52f4e6d4972f53b6a358d0e845c5 -r3c08ee728d08c7353d5bf6f79c2c549db74f468d
#
#
#
# patch "packages/ltrace/ltrace_0.4.bb"
# from [3ce9b9952390fbe5283a8d3f4734c71ab91a27cd]
# to [0afb57078b5e4b319c5c6f3b602321bf65f6ea65]
#
# patch "packages/openmoko2/openmoko-common2_svn.bb"
# from [0602e7f6a0a2737800ca104ff4d0574d94106dab]
# to [8e8aa666f2e39055016740a294a5dcd5482242ce]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [3142d9c5ee2a406f3f61b199443a3828c7acc136]
# to [348fb600361ca189638aa5f630ea59dd39c5cb85]
#
============================================================
--- packages/ltrace/ltrace_0.4.bb 3ce9b9952390fbe5283a8d3f4734c71ab91a27cd
+++ packages/ltrace/ltrace_0.4.bb 0afb57078b5e4b319c5c6f3b602321bf65f6ea65
@@ -1,13 +1,14 @@ SECTION = "devel"
DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
SECTION = "devel"
-DEPENDS = "libelf"
+DEPENDS = "binutils libelf"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
file://no-usr-include.patch;patch=1"
+
inherit autotools
PARALLEL_MAKE = ""
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb 0602e7f6a0a2737800ca104ff4d0574d94106dab
+++ packages/openmoko2/openmoko-common2_svn.bb 8e8aa666f2e39055016740a294a5dcd5482242ce
@@ -1,7 +1,7 @@ SECTION = "openmoko/base"
DESCRIPTION = "Common files for the OpenMoko framework"
SECTION = "openmoko/base"
-PV = "0.0+svnr${SRCREV}"
-PR = "r6"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
inherit openmoko2
@@ -13,7 +13,13 @@ do_install() {
dirs = "pixmaps"
do_install() {
- :
+ find . -name .svn | xargs rm -rf
+ install -d ${D}${datadir}
+ for i in ${dirs}; do
+ cp -fR $i ${D}${datadir}/$i;
+ done
+ # moved to xserver-kdrive-common
+ rm -f ${D}${datadir}/pixmaps/xsplash*
}
PACKAGE_ARCH = "all"
============================================================
--- packages/openmoko2/openmoko-session2.bb 3142d9c5ee2a406f3f61b199443a3828c7acc136
+++ packages/openmoko2/openmoko-session2.bb 348fb600361ca189638aa5f630ea59dd39c5cb85
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r35"
+PR = "r36"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -26,6 +26,7 @@ gconftool-2 --config-source=xml::$D${sys
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
# gstreamer audio settings
More information about the Openembedded-commits
mailing list