[oe-commits] org.oe.dev merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'

pfalcon commit openembedded-commits at lists.openembedded.org
Wed Jul 4 18:17:35 UTC 2007 

merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'
     and 'ffc6a1cb8a5c35ab9fdca8add26efc64679665b5'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 0eb06e644668e069af094409f30e23fcd3d9c1dc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0eb06e644668e069af094409f30e23fcd3d9c1dc
Files:
1
packages/linux/linux/sarge-at91
conf/machine/include/motorola-ezx-base.inc
conf/machine/sarge-at91.conf
packages/atk/atk_1.19.3.bb
packages/kazehakase/kazehakase_cvs.bb
packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
packages/linux/linux/sarge-at91/defconfig
packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch
packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch
packages/slugos-init/files/boot/kexec
packages/uboot/u-boot-1.1.6/sarge-uboot.patch
packages/uclibc/files/errno_values.h.patch
packages/uclibc/files/termios.h.patch
packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
classes/sanity.bbclass
classes/sdk.bbclass
conf/distro/angstrom-2007.1-legacy.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/sane-srcdates.inc
conf/distro/sharprom-compatible.conf
conf/machine/a1200.conf
conf/machine/a780.conf
conf/machine/e680.conf
conf/machine/htcwallaby.conf
conf/machine/rokr-e2.conf
packages/0xFFFF/0xffff-native_0.2.bb
packages/0xFFFF/0xffff.inc
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-fsg3.h
packages/gpephone/xoo-vm_0.7-20070204.bb
packages/kazehakase/kazehakase_0.4.5.bb
packages/kazehakase/kazehakase_0.4.7.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux.inc
packages/linux/linux_2.6.21.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk.bb
packages/modutils/modutils-cross_2.4.27.bb
packages/modutils/modutils_2.4.27.bb
packages/php/php_5.1.4.bb
packages/php/php_5.2.0.bb
packages/qemu/qemu-native.inc
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-slugos.bb
packages/uboot/u-boot_1.1.6.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
classes/opie.bbclass
classes/palmtop.bbclass
conf/bitbake.conf
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/libopie/libopie2.inc
packages/libopie/libopie2_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/libqtaux/libqtaux2.inc
packages/opie-alarm/opie-alarm.inc
packages/opie-alarm/opie-alarm_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init_1.2.2.bb
packages/opie-qcop/opie-qcop.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-qss/opie-qss.inc
packages/opie-qss/opie-qss_cvs.bb
packages/opie-quicklauncher/opie-quicklauncher.inc
packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:

#
# mt diff -r8ccf578d98540e0fe880015d1158e3f2e2d5fada -r0eb06e644668e069af094409f30e23fcd3d9c1dc
#
# 
# 
# add_dir "packages/linux/linux/sarge-at91"
# 
# add_file "conf/machine/include/motorola-ezx-base.inc"
#  content [0667c6b496dfb760566158b9fbbd7d6d278b90a6]
# 
# add_file "conf/machine/sarge-at91.conf"
#  content [c143fccacff25ccef3d78df850733d0a04c84286]
# 
# add_file "packages/atk/atk_1.19.3.bb"
#  content [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
# 
# add_file "packages/kazehakase/kazehakase_cvs.bb"
#  content [1b5a8edcf4a52f628f27e5e38dff856525b60edc]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch"
#  content [214f7346ed9238c8e7169504a486dd0d9b8e8f6d]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch"
#  content [bf050035be44127be85f7e032a598eedf4633167]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch"
#  content [9260941cf7e54b07a87e8ffda492d2ff9a25a460]
# 
# add_file "packages/linux/linux/sarge-at91/defconfig"
#  content [887a1501d7a72435df8b09c025425ef867d22132]
# 
# add_file "packages/linux/linux-rp-2.6.21/locomo_spi-r4.patch"
#  content [b8a26ac453b32eabec7a152dc8995c03346c07fa]
# 
# add_file "packages/linux/linux-rp-2.6.21/sharpsl_pm-r1.patch"
#  content [bb565e82d3dbd8bf8be036f83d615b6a6fb269e4]
# 
# add_file "packages/slugos-init/files/boot/kexec"
#  content [673016bf05b9aa6cb772a7c6b241caedab27151a]
# 
# add_file "packages/uboot/u-boot-1.1.6/sarge-uboot.patch"
#  content [c9ee9edf5969ee2d501b6edeae91189ad44478ab]
# 
# add_file "packages/uclibc/files/errno_values.h.patch"
#  content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
# 
# add_file "packages/uclibc/files/termios.h.patch"
#  content [a49212a1ef49d0a938f6687ab867600f05b3f1a4]
# 
# add_file "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
#  content [80a6d114216133cf5b84be77d9090ced7721b591]
# 
# patch "classes/sanity.bbclass"
#  from [cebf5a2ee9519f8342891e74db6ab2aaa370b992]
#    to [dcb94eb7036e5db9888430963dfbead08880632d]
# 
# patch "classes/sdk.bbclass"
#  from [f5a6cb53cd1f28070b6b61af23f5004767157e55]
#    to [100957b869cd48dd7933ace807f396c946442a32]
# 
# patch "conf/distro/angstrom-2007.1-legacy.conf"
#  from [6881282904bf0d4a7ea3e5a985cd8f22862e4561]
#    to [c5b38dbf99bb41080ad1856aeae6bb5359c8d578]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [59159a926215caee1cf37b3d07c5a4bcf28deb10]
#    to [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [cb939b1a389e8b33c0bf4f658e709da4337a4add]
#    to [c70c421338b418901a172a9210ea87a82ab763c0]
# 
# patch "conf/distro/include/angstrom-uclibc.inc"
#  from [5976f51d1a203540984b37aea9a01200c509f145]
#    to [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e]
#    to [211037ba3b8be809090a4a8d44a0ea8d709dae7e]
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [36c0bbeac678610033e6ff170af8457bd2f04dbb]
#    to [3c1abcc8cdbeb6500fc7e48ad25b8eb278dff3a1]
# 
# patch "conf/machine/a1200.conf"
#  from [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/a780.conf"
#  from [0b4ea0352725660f6f5612a0c0cb267b0274953e]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/e680.conf"
#  from [987ace20df2d1dc626ea26f22b62e9dc7289adc5]
#    to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
# 
# patch "conf/machine/htcwallaby.conf"
#  from [9eb8958a34abb017fe40020f1493f5bd050a6e52]
#    to [7eaaf072e197ae8aca3285e3c2c4decaa61230cc]
# 
# patch "conf/machine/rokr-e2.conf"
#  from [3c78073478e131d6f10f163a67a8c03cd4fa6593]
#    to [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
# 
# patch "packages/0xFFFF/0xffff-native_0.2.bb"
#  from [6c9e9ffc3d5527a829bca5d65361f0962b8747d3]
#    to [959e24359ef14785c97c6811de8c9643c2220911]
# 
# patch "packages/0xFFFF/0xffff.inc"
#  from [be76a770e7eaab17fb4a4733c9c98663400a2e99]
#    to [9635c8b2381625c57b4d8aa255b220f7739b0826]
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
#  from [363539e6aa9b48b4075ef6f22841c250058075ba]
#    to [691bb266bc3a89e594d2718bda178991edd6718a]
# 
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
#  from [6420555a5dfd7edfd3e08a847c058eb380b637df]
#    to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
# 
# patch "packages/gpephone/xoo-vm_0.7-20070204.bb"
#  from [5228f8e9c69a2d20caea19ae8d355fdf2a5295bb]
#    to [75d7ab96fd0fb00311b37907ddb10da84d8bef4e]
# 
# patch "packages/kazehakase/kazehakase_0.4.5.bb"
#  from [2e14bb25ffbd6926f5a10ff4eb9a140996a469c3]
#    to [33ebf750491386560f3a270602c11d797ef5bfb2]
# 
# patch "packages/kazehakase/kazehakase_0.4.7.bb"
#  from [c1051d793dabd07e39bcfb134d49967696a9bf43]
#    to [b6fe737fdbc7bc21d3c74fa6ee5984c468f858a0]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84]
#    to [a52ed332d359bc91a192a08cf926d94a67787424]
# 
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
#  from [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
#    to [cff3c0080167dd8eefe97ec8f9ba2f6e1b60269d]
# 
# patch "packages/linux/linux-x86_2.6.20.bb"
#  from [b5692bf04a1318c480b98b9968ab4ea4446181d9]
#    to [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
# 
# patch "packages/linux/linux.inc"
#  from [571ad2731ad0b3d6172a72c2f807cbcc9bb6c840]
#    to [08e72ce149668a87f2289e9d8b21ed7c99ea7fb8]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [53a97580492f0de948ef1e7ef160f429dc8a1408]
#    to [b173c031d2b38c69861aac233b95eb1254d0c9ed]
# 
# patch "packages/meta/meta-sdk-gpe.bb"
#  from [47ea869e6d4ac18d47ca62a018ebea80da185c55]
#    to [911556373f204b869c56247be3aa3b40fc1f128a]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [07d62cef69fc1e5ce78c9473a1807dab6b7e1a55]
#    to [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
# 
# patch "packages/modutils/modutils-cross_2.4.27.bb"
#  from [0930c6ca80cd394f3bc0297699ec6ee0c8e07077]
#    to [d2e5a6051325833d0a5b8fc3e3d9c178a778e38b]
# 
# patch "packages/modutils/modutils_2.4.27.bb"
#  from [064be998ea2ba1e1a54c8240906da23faeb1c552]
#    to [851e756dae52512055185fc00ee99ffbda2ac230]
# 
# patch "packages/php/php_5.1.4.bb"
#  from [faa45ca80e5ac5c9d8d718d4ccddc21f5f1510d8]
#    to [9c66e44fe96affb7d82ed7a6bc9371c158f7d081]
# 
# patch "packages/php/php_5.2.0.bb"
#  from [6c43a643d25ef8834530c67de3fff093916c345e]
#    to [b3ffd57d43ed9710b732bd9a0745a83a4a45e958]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [a6c0e5a75f0d0228a83c274f444a11031af95f6c]
#    to [71d3322a1e1cff08495c023c071fdd6a29e15a80]
# 
# patch "packages/slugos-init/files/boot/network"
#  from [7863638b33cded9710583ad3868e24dc35c04195]
#    to [1998f275fdd6f6ea83d325e7fe519c4357799e70]
# 
# patch "packages/slugos-init/files/functions"
#  from [de19dc6cafe30138b066dde30da63533e5278a40]
#    to [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
# 
# patch "packages/slugos-init/files/modulefunctions"
#  from [534b40287bd038eafad6f14953eb107d549b1230]
#    to [2fa625b35ea31712fde433431b13ec9b7c79d43b]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [71bdfe52397be1f4556cf272c28ecf7f960558ae]
#    to [838d2b4d97516e7beb1501277067200126a20075]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [736a212427892e2181e55efb54106fec963fcf48]
#    to [f882913a23b727a2f228423837f49cd69400af8b]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [9b3a116faea9265f7fc10285942e53fbc831e391]
#    to [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
# 
# patch "packages/uboot/u-boot_1.1.6.bb"
#  from [4fc0f6a543827c9634e59fdcf640234b80d8580f]
#    to [2c312681345e37f99ff59ba0f3b883c44dd4f35c]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [4747e0d84e923f3e2393759e6b97315cedfb9b8a]
#    to [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
# 
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
#  from [3eb23cf0c505c798552d20494b420631903c6ab1]
#    to [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
# 
============================================================
--- conf/machine/include/motorola-ezx-base.inc	0667c6b496dfb760566158b9fbbd7d6d278b90a6
+++ conf/machine/include/motorola-ezx-base.inc	0667c6b496dfb760566158b9fbbd7d6d278b90a6
@@ -0,0 +1,33 @@
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev:    size   erasesize  name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+
+#the EZX phones need a userspace daemon to stop the BP from shutting down the phone 
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
+ROOT_FLASH_SIZE = "24"
+
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
+
+# Opentapi needs to be started very early so we need the mux devices in static /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table-ezx.txt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/sarge-at91.conf	c143fccacff25ccef3d78df850733d0a04c84286
+++ conf/machine/sarge-at91.conf	c143fccacff25ccef3d78df850733d0a04c84286
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Sarge AT91RM9200 blackmesaeast dev boards
+#@DESCRIPTION: Machine configuration for sarge_at91 dev boards
+#
+#Homepage: http://blackmesaeast.com.pl/projects/electronics/sarge-single-board-computer/
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm920t.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# device has own patchset for u-boot 1.1.6
+PREFERRED_VERSION_u-boot = "1.1.6"
+PREFERRED_VERSION_linux  = "2.6.21"
============================================================
--- packages/atk/atk_1.19.3.bb	656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb	656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
@@ -0,0 +1,10 @@
+require atk.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
+
+do_stage () {
+        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
+}
============================================================
--- packages/kazehakase/kazehakase_cvs.bb	1b5a8edcf4a52f628f27e5e38dff856525b60edc
+++ packages/kazehakase/kazehakase_cvs.bb	1b5a8edcf4a52f628f27e5e38dff856525b60edc
@@ -0,0 +1,18 @@
+DESCRIPTION = "A gtk-webcore based browser"
+HOMEPAGE = "http://kazehakase.sourceforge.jp/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+DEPENDS = "osb-nrcit glib-2.0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/kazehakase;module=kazehakase"
+S = "${WORKDIR}/kazehakase"
+
+
+PV = "0.4.7+cvs${SRCDATE}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-gtkmozembed "
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch	214f7346ed9238c8e7169504a486dd0d9b8e8f6d
+++ packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch	214f7346ed9238c8e7169504a486dd0d9b8e8f6d
@@ -0,0 +1,238 @@
+diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S
+--- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S	2007-06-12 22:29:12.000000000 +0200
++++ ./arch/arm/boot/compressed/head-at91rm9200.S	2007-06-12 02:57:07.000000000 +0200
+@@ -73,6 +73,12 @@
+ 		cmp	r7, r3
+ 		beq	99f
+ 
++                @ AT91RM9200
++                mov     r3,     #(MACH_TYPE_AT91RM9200 & 0xff)
++                orr     r3, r3, #(MACH_TYPE_AT91RM9200 & 0xff00)
++                cmp     r7, r3
++                beq     99f
++
+ 		@ Unknown board, use the AT91RM9200DK board
+ 		@ mov	r7, #MACH_TYPE_AT91RM9200
+ 		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)
+diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c
+--- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c	1970-01-01 01:00:00.000000000 +0100
++++ ./arch/arm/mach-at91/board-sarge.c	2007-06-12 02:57:07.000000000 +0200
+@@ -0,0 +1,190 @@
++/*
++ * linux/arch/arm/mach-at91/board-sarge.c
++ *
++ *  Copyright (C) 2007 BlackMesaEast staff
++ *
++ *	mcgregor at blackmesaeast.com.pl
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/mtd/physmap.h>
++
++#include <asm/hardware.h>
++#include <asm/setup.h>
++#include <asm/mach-types.h>
++#include <asm/irq.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/map.h>
++#include <asm/mach/irq.h>
++
++#include <asm/arch/board.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/at91rm9200_mc.h>
++
++#include "generic.h"
++
++
++/*
++ * Serial port configuration.
++ *    0 .. 3 = USART0 .. USART3
++ *    4      = DBGU
++ */
++static struct at91_uart_config __initdata sarge_uart_config = {
++	.console_tty	= 0,				/* ttyS0 */
++	.nr_tty		= 5,
++	.tty_map	= { 4, 1, 0, 2, 3 }		/* ttyS0, ..., ttyS4 */
++};
++
++static void __init sarge_map_io(void)
++{
++	/* Initialize processor: 18.432 MHz crystal */
++	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
++
++	/* Setup the serial ports and console */
++	at91_init_serial(&sarge_uart_config);
++}
++
++static void __init sarge_init_irq(void)
++{
++	at91rm9200_init_interrupts(NULL);
++}
++
++static struct at91_eth_data __initdata sarge_eth_data = {
++	.phy_irq_pin	= AT91_PIN_PB1,
++	.is_rmii	= 0,
++};
++
++static struct at91_usbh_data __initdata sarge_usbh_data = {
++	.ports		= 1,
++};
++
++static struct at91_udc_data __initdata sarge_udc_data = {
++	.vbus_pin	= AT91_PIN_PA20,
++	.pullup_pin	= AT91_PIN_PA21,
++};
++
++static struct at91_cf_data __initdata sarge_cf_data = {
++	.det_pin	= AT91_PIN_PB24,
++	.rst_pin	= AT91_PIN_PB23,
++	// .irq_pin	= ... not connected
++	// .vcc_pin	= ... always powered
++};
++
++static struct at91_mmc_data __initdata sarge_mmc_data = {
++	.det_pin	= AT91_PIN_PB0,
++	.slot_b		= 0,	
++	.wire4		= 1,	
++	.wp_pin		= AT91_PIN_PB2,
++};
++
++
++
++static struct spi_board_info sarge_spi_devices[] = {
++	{	/* DataFlash chip */
++		.modalias	= "mtd_dataflash",
++		.chip_select	= 0,
++		.max_speed_hz	= 15 * 1000 * 1000,
++	}
++};
++
++static struct mtd_partition __initdata sarge_nand_partition[] = {
++	{
++		.name	= "NAND Partition 1",
++		.offset	= 0,
++		.size	= MTDPART_SIZ_FULL,
++	},
++};
++
++static struct mtd_partition *nand_partitions(int size, int *num_partitions)
++{
++	*num_partitions = ARRAY_SIZE(sarge_nand_partition);
++	return sarge_nand_partition;
++}
++
++static struct at91_nand_data __initdata sarge_nand_data = {
++	.ale		= 22,
++	.cle		= 21,
++	.det_pin	= AT91_PIN_PB22,
++	.rdy_pin	= AT91_PIN_PB22,
++	// .enable_pin	= ... not there
++	.partition_info	= nand_partitions,
++};
++
++#define SARGE_FLASH_BASE	AT91_CHIPSELECT_0
++#define SARGE_FLASH_SIZE	0x200000
++
++static struct physmap_flash_data sarge_flash_data = {
++	.width		= 2,
++};
++
++static struct resource sarge_flash_resource = {
++	.start		= SARGE_FLASH_BASE,
++	.end		= SARGE_FLASH_BASE + SARGE_FLASH_SIZE - 1,
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct platform_device sarge%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rffc6a1cb8a5c35ab9fdca8add26efc64679665b5 -r0eb06e644668e069af094409f30e23fcd3d9c1dc
#
# 
# 
# patch "classes/opie.bbclass"
#  from [2653571d91e93ff5043997740e80656344ad35d8]
#    to [441638d80c7d1595e6037940f20b24b8bca48ebd]
# 
# patch "classes/palmtop.bbclass"
#  from [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
#    to [56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb]
# 
# patch "conf/bitbake.conf"
#  from [4481b02aa24ad52f996889ffadf4f12e9912c116]
#    to [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
#  from [5f9b174bd679d8f5b634fdcde2cddde0853a9369]
#    to [5045ef2e767e1eb852ad651743f8406528e34237]
# 
# patch "packages/libopie/libopie2.inc"
#  from [1473fa57b6e31b62c32c3f467f79fb57b52dc658]
#    to [46a70b5412163b8031b130f39a8726cfbb93dd6b]
# 
# patch "packages/libopie/libopie2_cvs.bb"
#  from [66b355cdaf0863882ba11282e95ea14ad73da233]
#    to [5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87]
# 
# patch "packages/libqpe/libqpe-opie.inc"
#  from [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
#    to [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
# 
# patch "packages/libqpe/libqpe-opie_cvs.bb"
#  from [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
#    to [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
# 
# patch "packages/libqtaux/libqtaux2.inc"
#  from [5250f41cd924ff8df098caa6a7e0729af80c2553]
#    to [0c427ee2ab568405ca1b63c3b4c07177b5963b94]
# 
# patch "packages/opie-alarm/opie-alarm.inc"
#  from [4a1a59205a8611a22b1346bc7f42b353e20d5652]
#    to [07de57bed4ed8e3cb6e9d63ab283f3914598dc35]
# 
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
#  from [1796ca94836c627bd6abf2690d14a343efbdf8ee]
#    to [2bdbe943e8bc210a02a9065675475fe62b3d1b31]
# 
# patch "packages/opie-init/opie-init/opie"
#  from [939a977703c5c993189c8355d175b621bfe71969]
#    to [73b9b430d7e84543dc155768280a0637d7dd4175]
# 
# patch "packages/opie-init/opie-init_1.2.2.bb"
#  from [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
#    to [498d6c9f6e35eb30079cd3afd4685d82291df346]
# 
# patch "packages/opie-qcop/opie-qcop.inc"
#  from [5a2b1a1f0ec2d69a4d4c851c4d6ac6c50ca0a49d]
#    to [fcf1b2682b07002f61b4f423c9ba3de8f1267a93]
# 
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
#  from [c2097d44582c668bbb719ae77cb032333a4a58de]
#    to [13db751dc05218bcda19c0254130a3083f6f6137]
# 
# patch "packages/opie-qss/opie-qss.inc"
#  from [24500a4faeeb7c466f109bbac2d55ad32a0de673]
#    to [35451379dab7f75ba605b88c3ff29bb4f09d8641]
# 
# patch "packages/opie-qss/opie-qss_cvs.bb"
#  from [197567cb76e69706001149dcace45820034867bb]
#    to [f270446f9bf86f9676a307c3f33e54275536b6d6]
# 
# patch "packages/opie-quicklauncher/opie-quicklauncher.inc"
#  from [08c19f70c27a55e7af90b65ca9f2bbf5a36a8f55]
#    to [48fe0abf27157f260e622aa3abfa2c54ea2a92ed]
# 
# patch "packages/opie-quicklauncher/opie-quicklauncher_cvs.bb"
#  from [d844e5142763e1aa87b5ceba214d3ba4a89a8606]
#    to [f9d1805249f9ed2056460ce0eb86fc1977af98e3]
# 
# patch "packages/opie-taskbar/opie-taskbar.inc"
#  from [5e37066e544b2568997efb629a7497162c167149]
#    to [612634b0a0376dfe1e4b563804c51987a32320b0]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [6e4c569e12d7cb8d875e488eac41f12c82db84a9]
#    to [0081cd5790b5ddf838977339678872f2b347b50c]
# 
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
#  from [485a535dc2b358d5755ccec0f9697b159b0bb964]
#    to [4dc8b9267c72d84126fbce18970082e888865a36]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [77b17aa1d6610e4d5c33ba805a1fef052f47a292]
#    to [1a5f4ceaa263a33d8d30eda388b0f01363c7676f]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [f87b668c5dc754048758ef15a98e30583eb4067b]
#    to [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
# 
============================================================
--- classes/opie.bbclass	2653571d91e93ff5043997740e80656344ad35d8
+++ classes/opie.bbclass	441638d80c7d1595e6037940f20b24b8bca48ebd
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
 	D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
 	WORKDIR = bb.data.getVar( "WORKDIR", d, True )
 	palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+	gnubindir = bb.data.getVar( "bindir", d, True )
 	APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
 
 	if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
 	os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
 
 	if APPTYPE == "binary":
-		os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
 	elif APPTYPE == "quicklaunch":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
-		os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
-		os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
 	elif APPTYPE == "plugin":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
 }
============================================================
--- classes/palmtop.bbclass	47dee0d1bcbc560241a59d1d1689a90ca8e37b3f
+++ classes/palmtop.bbclass	56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb
@@ -19,8 +19,7 @@ PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN} = " ${palmtopdir} "
-FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN} += " ${palmtopdir} "
 FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
                      ${palmtopdir}/bin/.debug \
                      ${palmtopdir}/plugins/*/.debug "
============================================================
--- conf/bitbake.conf	4481b02aa24ad52f996889ffadf4f12e9912c116
+++ conf/bitbake.conf	28be7aa3c03959211fa8fff38d1903e1ec2dd8de
@@ -319,8 +319,8 @@ export OPIEDIR = "${STAGING_DIR}/${HOST_
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
 export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
 export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "${prefix}"
-export palmqtdir = "${prefix}"
+export palmtopdir = "${libdir}/opie"
+export palmqtdir = "${palmtopdir}"
 
 ##################################################################
 # Download locations and utilities.
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	5f9b174bd679d8f5b634fdcde2cddde0853a9369
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	5045ef2e767e1eb852ad651743f8406528e34237
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 #
 # Default versions
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070702"
+OPIE_SRCDATE ?= "20070703"
 OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
 
============================================================
--- packages/libopie/libopie2.inc	1473fa57b6e31b62c32c3f467f79fb57b52dc658
+++ packages/libopie/libopie2.inc	46a70b5412163b8031b130f39a8726cfbb93dd6b
@@ -71,29 +71,29 @@ do_install() {
 }
 
 do_install() {
-	install -d ${D}${palmtopdir}/lib
+	install -d ${D}${libdir}
 	for f in ${LIBS}
 	do
-		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
+		oe_libinstall -so libopie$f ${D}${libdir}
 	done
 }
 
 PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
 
 DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
+FILES_libopiecore2 = "${libdir}/libopiecore2.so.*"
 DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
+FILES_libopiedb2 = "${libdir}/libopiedb2.so.*"
 DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
+FILES_libopiemm2 = "${libdir}/libopiemm2.so.*"
 DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
+FILES_libopienet2 = "${libdir}/libopienet2.so.*"
 DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
+FILES_libopiepim2 = "${libdir}/libopiepim2.so.*"
 DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
+FILES_libopieui2 = "${libdir}/libopieui2.so.*"
 DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
+FILES_libopiesecurity2 = "${libdir}/libopiesecurity2.so.*"
 DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
-FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*"
+FILES_libopiebluez2 = "${libdir}/libopiebluez2.so.*"
 
============================================================
--- packages/libopie/libopie2_cvs.bb	66b355cdaf0863882ba11282e95ea14ad73da233
+++ packages/libopie/libopie2_cvs.bb	5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87
@@ -1,7 +1,7 @@ PV = "1.2.2+cvs${SRCDATE}"
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/libqpe/libqpe-opie.inc	3346fde77506aea54b8d7d57c5fe1dcae017a6ca
+++ packages/libqpe/libqpe-opie.inc	c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3
@@ -16,15 +16,7 @@ CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT
 EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
 CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-#CXXFLAGS_append_c7x0 =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
 
-do_compile_prepend_mnci () {
-	ln -s custom-ramses.h custom.h
-}
-
 do_compile() {
         mkdir -p ${STAGING_INCDIR}/qpe \
                  ${STAGING_INCDIR}/qtopia \
@@ -53,9 +45,9 @@ do_install() {
 }
 
 do_install() {
-	oe_libinstall -so libqpe ${D}${palmtopdir}/lib
+	oe_libinstall -so libqpe ${D}${libdir}
 
-    install -d ${D}${includedir}/qpe \
+        install -d ${D}${includedir}/qpe \
                ${D}${includedir}/qtopia/private
 
 	for i in ${S}/*.h
@@ -72,8 +64,3 @@ do_install() {
 	done
 	rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
 }
-
-FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
-FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so"
-FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb	f96cc1aefe160f38dd0536ab17ca7a8896d39937
+++ packages/libqpe/libqpe-opie_cvs.bb	66eb84a06f4f226608fdaccbcc077ac5fb2e540e
@@ -1,7 +1,7 @@ PV = "1.2.2+cvs${SRCDATE}"
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
============================================================
--- packages/libqtaux/libqtaux2.inc	5250f41cd924ff8df098caa6a7e0729af80c2553
+++ packages/libqtaux/libqtaux2.inc	0c427ee2ab568405ca1b63c3b4c07177b5963b94
@@ -22,8 +22,5 @@ do_install() {
 }
 
 do_install() {
-	oe_libinstall -so libqtaux2 ${D}${palmtopdir}/lib
+	oe_libinstall -so libqtaux2 ${D}${libdir}
 }
-
-FILES_${PN}="${palmtopdir}/lib"
-
============================================================
--- packages/opie-alarm/opie-alarm.inc	4a1a59205a8611a22b1346bc7f42b353e20d5652
+++ packages/opie-alarm/opie-alarm.inc	07de57bed4ed8e3cb6e9d63ab283f3914598dc35
@@ -10,9 +10,7 @@ do_install() {
 inherit opie
 
 do_install() {
-	install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
-	install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+	install -d ${D}${bindir} ${D}${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}${bindir}/
 	install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
 }
-
-FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb	1796ca94836c627bd6abf2690d14a343efbdf8ee
+++ packages/opie-alarm/opie-alarm_cvs.bb	2bdbe943e8bc210a02a9065675475fe62b3d1b31
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm "
============================================================
--- packages/opie-init/opie-init/opie	939a977703c5c993189c8355d175b621bfe71969
+++ packages/opie-init/opie-init/opie	73b9b430d7e84543dc155768280a0637d7dd4175
@@ -9,9 +9,9 @@ export PATH=$PATH:$OPIEDIR/bin
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
 export PATH=$PATH:$OPIEDIR/bin
 
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
+if [ -z `which qpe` ] ; then 
     echo Opie not installed
-    exit 0 
+    exit 0
 fi
 
 . /etc/profile
@@ -34,14 +34,8 @@ fi
     echo "1.13" >$HOME/systeminfo/linkver
 fi
 
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
 case $1 in
 'start')
-    #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-
     # Turn off psplash if any - sleep is required for anti-race
     if [ -e /mnt/.psplash ]; then
         TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
@@ -52,7 +46,7 @@ case $1 in
             echo Starting Opie-login....
             $OPIEDIR/bin/opie-login -terminal 3
     else
-        $OPIEDIR/bin/opie-reorgfiles
+        opie-reorgfiles
         
         if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
             export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
@@ -60,15 +54,15 @@ case $1 in
         echo Starting Opie....
 	(
 	 test -x /usr/bin/ssh-agent && eval $(/usr/bin/ssh-agent -s) && echo $SSH_AGENT_PID>/var/run/opie-ssh-agent.pid ;
-         $OPIEDIR/bin/qpe -terminal 3
+         qpe -terminal 3
 	)
 	echo -n >/var/log/opie-qss.log
-	test -x $OPIEDIR/bin/qpe && { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do
+	{ for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do
 	    sleep 1
 	    echo "Waiting for qcop to startup: $attempt ..." >>/var/log/opie-qss.log
-	    $OPIEDIR/bin/qcop QPE/System 'ping()' || continue
+	    qcop QPE/System 'ping()' || continue
 	    echo "Starting qss" >>/var/log/opie-qss.log
-	    $OPIEDIR/bin/qss </dev/null >>/var/log/opie-qss.log 2>&1
+	    qss </dev/null >>/var/log/opie-qss.log 2>&1
 	    echo "qss exited, will try to restart" >>/var/log/opie-qss.log
 	done; rm /var/run/opie-qss-loop.pid; } &
 	echo $! >/var/run/opie-qss-loop.pid
============================================================
--- packages/opie-init/opie-init_1.2.2.bb	c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9
+++ packages/opie-init/opie-init_1.2.2.bb	498d6c9f6e35eb30079cd3afd4685d82291df346
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
============================================================
--- packages/opie-qcop/opie-qcop.inc	5a2b1a1f0ec2d69a4d4c851c4d6ac6c50ca0a49d
+++ packages/opie-qcop/opie-qcop.inc	fcf1b2682b07002f61b4f423c9ba3de8f1267a93
@@ -8,6 +8,6 @@ do_install() {
 inherit opie
 
 do_install() {
-	install -d ${D}${palmtopdir}/bin/
-	install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/qcop ${D}${bindir}/qcop
 }
============================================================
--- packages/opie-qcop/opie-qcop_cvs.bb	c2097d44582c668bbb719ae77cb032333a4a58de
+++ packages/opie-qcop/opie-qcop_cvs.bb	13db751dc05218bcda19c0254130a3083f6f6137
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
            file://unbreak-logging.patch;patch=1"
============================================================
--- packages/opie-qss/opie-qss.inc	24500a4faeeb7c466f109bbac2d55ad32a0de673
+++ packages/opie-qss/opie%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list