Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/07 18:27:23+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/01/07 18:25:57+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/01/07 18:25:33+01:00 (none)!br1
fix libperl soname

2005/01/07 18:25:06+01:00 (none)!koen
the faad2 patch line-ending saga continues

2005/01/07 18:08:48+01:00 (none)!koen
*really* fix faad2 makefile.patch (crosses fingers)

2005/01/07 18:04:17+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/07 18:04:05+01:00 (none)!koen
Fix faad2 patch to use dos-style line endings

2005/01/07 18:02:36+01:00 (none)!koen
added faad patch with correct line-endings

2005/01/07 17:47:38+01:00 uni-frankfurt.de!mickeyl
add openzaurus-pxa-2.6 machine support

2005/01/07 17:43:40+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/07 17:42:19+01:00 uni-frankfurt.de!mickeyl
add openzaurus-pxa-2.6 support to qte-2.3.9 and opie-taskbar-cvs

2005/01/07 17:36:42+01:00 uni-frankfurt.de!mickeyl
add new machine configuration 'openzaurus-pxa-2.6' as well as the necessary machine dependent files

BKrev: 41dec97aspbPf4bkaUSarhsLYAYKlw

14 files changed, 28 insertions, 6 deletions

diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/openzaurus-pxa-2.6.conf
diff --git a/packages/base-files/base-files/openzaurus-pxa-2.6/fstab b/packages/base-files/base-files/openzaurus-pxa-2.6/fstab
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/openzaurus-pxa-2.6/fstab
diff --git a/packages/base-files/base-files/openzaurus-pxa-2.6/usbd b/packages/base-files/base-files/openzaurus-pxa-2.6/usbd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/openzaurus-pxa-2.6/usbd
diff --git a/packages/faad2/faad2-2.0/Makefile-dos.patch b/packages/faad2/faad2-2.0/Makefile-dos.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/faad2/faad2-2.0/Makefile-dos.patch
diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
diff --git a/packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6 b/packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-2.6.10/defconfig-openzaurus-pxa-2.6
diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
index 2d2384c9c0..dd0028745a 100644
--- a/packages/linux/openzaurus_2.6.10.bb
+++ b/packages/linux/openzaurus_2.6.10.bb
@@ -1,9 +1,10 @@
-SECTION = "kernel"
 DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices."
+SECTION = "kernel"
+MAINTAINER = "Richard Purdie <rp@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r1"
+PR = "r2"
 
 #SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 #          http://www.cs.wisc.edu/~lenz/zaurus/files/patch-2.6.7-jl1.diff.gz;patch=1 \
@@ -30,7 +31,7 @@ http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r2.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_map-r1.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r4.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r5.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r6.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_param-r1.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r2.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power-r3.patch;patch=1 \
@@ -45,7 +46,8 @@ file://defconfig-husky \
 file://defconfig-collie \
 file://defconfig-poodle "
 
-SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r0.patch;patch=1"
+SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
+SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
 SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1"	   
 
 
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/qpe.conf b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/qpe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/qpe.conf
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 894f97a63c..dce47d384a 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -22,7 +22,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://qpe.conf \
 	   file://locale.conf \
 	   file://opie_defaults"
-
 S = "${WORKDIR}/launcher"
 
 # Caps/Numlock icons for devices with keyboard
@@ -32,12 +31,14 @@ EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_openzaurus-pxa-2.6 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 
 # Wallpaper and welcome splash
 PIXMAP_SIZE 		= ""
 PIXMAP_SIZE_shepherd 	= "-640x480"
 PIXMAP_SIZE_corgi 	= "-640x480"
 PIXMAP_SIZE_husky 	= "-640x480"
+PIXMAP_SIZE_openzaurus-pxa-2.6 = "-640x480"
 # PIXMAP_SIZE_tosa 	= "-640x480"
 PIXMAP_SIZE_simpad 	= "-800x600"
 
@@ -126,6 +127,11 @@ do_install_append_tosa () {
 	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
 }
+do_install_append_openzaurus-pxa-2.6 () {
+        install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
 
 FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
 
diff --git a/packages/perl/perl-5.8.3/libperl-5.8.3-create-libperl-soname.patch b/packages/perl/perl-5.8.3/libperl-5.8.3-create-libperl-soname.patch
index e69de29bb2..6b34ec2318 100644
--- a/packages/perl/perl-5.8.3/libperl-5.8.3-create-libperl-soname.patch
+++ b/packages/perl/perl-5.8.3/libperl-5.8.3-create-libperl-soname.patch
@@ -0,0 +1,11 @@
+--- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
++++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
+@@ -494,7 +494,7 @@
+ 	case "$useshrplib" in
+ 	true)
+ 		$spitshell >>Makefile <<'!NO!SUBS!'
+-	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
++	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -soname libperl.so.5
+ !NO!SUBS!
+ 		case "$osname" in
+ 		aix)
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index c44ca05ae6..4148519cb8 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
    	   file://qpe.patch;patch=1 \
@@ -28,6 +28,8 @@ SRC_URI_append_husky		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap
 SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
 
+SRC_URI_append_openzaurus-pxa-2.6 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1"
+
 S = "${WORKDIR}/qt-${PV}"
 
 export QTDIR = "${S}"
@@ -65,6 +67,7 @@ EXTRA_DEFINES_corgi     	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS
 EXTRA_DEFINES_shepherd  	= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_husky		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle		= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
+EXTRA_DEFINES_openzaurus-pxa-2.6= "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"
diff --git a/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf b/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/openzaurus-pxa-2.6/ts.conf
diff --git a/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh b/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/openzaurus-pxa-2.6/tslib.sh