summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/ccache.inc (renamed from packages/base-passwd/base-passwd-3.5.7/configure.patch)0
-rw-r--r--classes/opie.bbclass1
-rw-r--r--conf/distro/asusoe.conf (renamed from packages/base-passwd/base-passwd-3.5.7/nobash.patch)0
-rw-r--r--conf/distro/familiar-0.8.2.conf2
-rw-r--r--conf/distro/openslug.conf1
-rw-r--r--conf/distro/openzaurus-3.5.3.conf2
-rw-r--r--conf/distro/preferred-gpe-versions.inc5
-rw-r--r--conf/distro/unslung.conf21
-rw-r--r--conf/machine/wl500g.conf (renamed from packages/base-passwd/base-passwd-3.5.7/root-home.patch)0
-rw-r--r--files/device_table-unslung.txt2
-rw-r--r--packages/base-passwd/base-passwd-3.5.9/configure.patch (renamed from packages/dropbear/dropbear-0.43/configure.patch)0
-rw-r--r--packages/base-passwd/base-passwd-3.5.9/nobash.patch (renamed from packages/dropbear/dropbear-0.43/allow-nopw.patch)0
-rw-r--r--packages/base-passwd/base-passwd-3.5.9/root-home.patch (renamed from packages/dropbear/dropbear-0.43/multi-binary.patch)0
-rw-r--r--packages/base-passwd/base-passwd_3.5.7.bb56
-rw-r--r--packages/base-passwd/base-passwd_3.5.9.bb (renamed from packages/dropbear/dropbear-0.44/allow-nopw.patch)0
-rw-r--r--packages/bazaar/bazaar_1.2.bb (renamed from packages/dropbear/dropbear-0.44/configure.patch)0
-rw-r--r--packages/bazaar/files/import_dirarg.patch (renamed from packages/dropbear/dropbear-0.44/fix-2kb-keys.patch)0
-rw-r--r--packages/bazaar/files/no_archive_format_guess_msg.patch (renamed from packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch)0
-rw-r--r--packages/cumulus/cumulus_1.2.1.bb (renamed from packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch)0
-rw-r--r--packages/cumulus/cumulus_1.2.bb36
-rw-r--r--packages/cumulus/cumulus_cvs.bb4
-rw-r--r--packages/dropbear/dropbear_0.43.bb63
-rw-r--r--packages/dropbear/dropbear_0.44.bb62
-rw-r--r--packages/dropbear/dropbear_0.45.bb66
-rw-r--r--packages/gpe-contacts/gpe-contacts_0.36.bb (renamed from packages/dropbear/dropbear-0.44/multi-binary.patch)0
-rw-r--r--packages/initscripts/initscripts-1.0/device_table.txt4
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
-rw-r--r--packages/ipkg/ipkg-0.99.144/paths.patch30
-rw-r--r--packages/kaffe/files/disable-automake-checks.patch (renamed from packages/dropbear/dropbear-0.44/use-urandom.patch)0
-rw-r--r--packages/kaffe/kaffe-gtk_cvs.bb (renamed from packages/dropbear/dropbear-0.44/xauth-path.patch)0
-rw-r--r--packages/kaffe/kaffe-qt_cvs.bb (renamed from packages/qpegps/qpegps-0.9.1+cvs-20040817/gpsd-fix.patch)0
-rw-r--r--packages/kaffe/kaffe.inc0
-rw-r--r--packages/kaffe/kaffeh-native_cvs.bb0
-rw-r--r--packages/kbdd/files/kbdd-modules0
-rw-r--r--packages/kbdd/files/kbdd.conf0
-rw-r--r--packages/kbdd/files/kbdd.init0
-rw-r--r--packages/kbdd/kbdd_cvs.bb32
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.17.bb0
-rw-r--r--packages/libsamplerate/libsamplerate0_0.1.2.bb17
-rw-r--r--packages/libsndfile/libsndfile1_1.0.11.bb0
-rw-r--r--packages/linux-hotplug/files/mmc.agent51
-rw-r--r--packages/linux-hotplug/linux-hotplug_20040920.bb1
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb52
-rw-r--r--packages/linux/linux-wrt-2.4.20/110-sch_htb.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/120-openwrt.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/130-nfsswap.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/140-ebtables-brnf-5.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/150-mppe-mppc-0.98.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/160-expr.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/2.4.20_broadcom_3_37_2_1109_US.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/defconfig0
-rw-r--r--packages/linux/linux-wrt-2.4.20/diag.c0
-rw-r--r--packages/linux/linux-wrt-2.4.20/gcc3.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/gcc_mtune.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/linux-2.4.20-mipscvs.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/linux-2.4.24-attribute-used.patch0
-rw-r--r--packages/linux/linux-wrt-2.4.20/nobcom.patch0
-rw-r--r--packages/linux/linux-wrt_2.4.20.bb0
-rw-r--r--packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc4
-rw-r--r--packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb4
-rw-r--r--packages/linux/unslung-able-kernel_2.3r25.bb7
-rw-r--r--packages/linux/unslung-kernel-2.3r25/able/defconfig992
-rw-r--r--packages/linux/unslung-kernel-2.3r25/defconfig210
-rw-r--r--packages/linux/unslung-kernel_2.3r25.bb0
-rw-r--r--packages/linux/unslung-standard-kernel_2.3r25.bb33
-rw-r--r--packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb25
-rw-r--r--packages/mbmerlin/mbmerlin_0.8.1-2.bb1
-rw-r--r--packages/meta/meta-opie.bb27
-rw-r--r--packages/meta/meta-sectest-gpe.bb2
-rw-r--r--packages/meta/openslug-packages.bb28
-rw-r--r--packages/meta/opie-collections.inc2
-rw-r--r--packages/meta/task-bootstrap.bb2
-rw-r--r--packages/meta/task-python-sharprom_0.9.0.bb0
-rw-r--r--packages/meta/unslung-able-image.bb4
-rw-r--r--packages/meta/unslung-image.bb51
-rw-r--r--packages/meta/unslung-packages.bb16
-rw-r--r--packages/meta/unslung-standard-image.bb41
-rw-r--r--packages/mt-daapd/mt-daapd_0.2.1.1.bb2
-rw-r--r--packages/muxsshssl/muxsshssl_1.0.bb0
-rw-r--r--packages/nail/nail_11.21.bb0
-rw-r--r--packages/neon/neon_0.24.7.bb18
-rw-r--r--packages/netbase/netbase/wrt54/interfaces0
-rw-r--r--packages/netbase/netbase_4.19.bb37
-rw-r--r--packages/netbase/netbase_4.20.bb0
-rw-r--r--packages/nonworking/polypaudio/polypaudio_0.7.bb0
-rw-r--r--packages/nslu2-binary-only/unslung-able-rootfs_2.3r25.bb7
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling114
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb0
-rw-r--r--packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb98
-rw-r--r--packages/openswan/openswan_2.2.0.bb2
-rw-r--r--packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb0
-rw-r--r--packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb0
-rw-r--r--packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb0
-rw-r--r--packages/pcmciautils/pcmciautils_001.bb0
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/cellardb.patch0
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch0
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/winedb.patch0
-rw-r--r--packages/pocketcellar/pocketcellar_1.1.bb16
-rw-r--r--packages/python/python-2.4.0-manifest.inc6
-rw-r--r--packages/python/python_2.4.0.bb2
-rw-r--r--packages/qpegps/qpegps_0.9.1+cvs-20040817.bb36
-rw-r--r--packages/qpegps/qpegps_0.9.2.2.bb35
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.bb0
-rw-r--r--packages/qte/qte-2.3.10/ipaq_sound_fix.patch0
-rw-r--r--packages/qte/qte-2.3.10/key.patch79
-rw-r--r--packages/qte/qte-2.3.10/ramses-keyboard.patch2339
-rw-r--r--packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp0
-rw-r--r--packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h0
-rw-r--r--packages/qte/qte_2.3.10.bb17
-rw-r--r--packages/spca5xx/spca5xx_20050319.bb0
-rw-r--r--packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch0
-rw-r--r--packages/sysfsutils/sysfsutils_1.2.0.bb6
-rw-r--r--packages/ttyconv/ttyconv_0.2.3.bb0
-rw-r--r--packages/vlc/vlc-gpe_0.8.1.bb4
-rw-r--r--packages/w3cam/files/staticpaths.patch0
-rw-r--r--packages/w3cam/w3cam_0.7.2.bb0
-rw-r--r--packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb9
-rw-r--r--packages/zaurus-updater/spitz/updater.sh.c3000323
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb18
-rw-r--r--packages/zeecookbook/files/zeecookbook.patch0
-rw-r--r--packages/zeecookbook/zeecookbook_1.0beta3.bb24
-rw-r--r--packages/zeecookbook/zeecookbook_1.1.bb0
122 files changed, 1126 insertions, 4025 deletions
diff --git a/packages/base-passwd/base-passwd-3.5.7/configure.patch b/classes/ccache.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-passwd/base-passwd-3.5.7/configure.patch
+++ b/classes/ccache.inc
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index f276e3436c..7326128d98 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -52,6 +52,7 @@ python opie_do_opie_install() {
"Security" : ( "/plugins/security", None ),
"Styles" : ( "/plugins/styles", None ),
"Today" : ( "/plugins/today", None ),
+ "Datebook" : ( "/plugins/holidays", None ),
"Networksettings" : ( "/plugins/networksettings", None ) }
if section not in dirmap:
diff --git a/packages/base-passwd/base-passwd-3.5.7/nobash.patch b/conf/distro/asusoe.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-passwd/base-passwd-3.5.7/nobash.patch
+++ b/conf/distro/asusoe.conf
diff --git a/conf/distro/familiar-0.8.2.conf b/conf/distro/familiar-0.8.2.conf
index 8e4e70ce1c..42b812269f 100644
--- a/conf/distro/familiar-0.8.2.conf
+++ b/conf/distro/familiar-0.8.2.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
base##http://familiar.handhelds.org/releases/v0.8.1/feed/base \
updates#http://familiar.handhelds.org/releases/v0.8.1/feed/updates"
-CVSDATE = 20050315
+#CVSDATE = 20050322
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index d0ce898056..936ff82511 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -4,6 +4,7 @@
DISTRO_NAME = "OpenSlug"
DISTRO_VERSION = "1.7-beta"
+DISTRO_TYPE = "beta"
TARGET_FPU = "soft"
TARGET_OS = "linux"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index f8c6486f5d..3b7aa1994e 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
console##http://openzaurus.org/official/unstable/3.5.2/feed/console \
devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
-CVSDATE = "20050313"
+CVSDATE = "20050320"
#
# Zaurus
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 2e47340a6e..0851c2e696 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -3,7 +3,7 @@
#
#work around some breakages
-CVSDATE_xserver-kdrive=20050207
+#CVSDATE_xserver-kdrive=20050207
#specify versions, as the header says :)
PREFERRED_VERSION_libmatchbox = "1.6"
@@ -25,6 +25,7 @@ PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
PREFERRED_VERSION_rxvt-unicode = "5.3"
PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
PREFERRED_VERSION_xst = "0.14"
+PREFERRED_VERSION_xextensions = "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xhost = "0.0cvs20040413"
PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
@@ -34,7 +35,7 @@ PREFERRED_VERSION_gpe-soundserver = "0.4-1"
PREFERRED_VERSION_gpe-todo = "0.50"
PREFERRED_VERSION_gpe-calendar = "0.61"
PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.35"
+PREFERRED_VERSION_gpe-contacts = "0.36"
PREFERRED_VERSION_gpe-today = "0.08"
PREFERRED_VERSION_matchbox-panel-manager = "0.1"
PREFERRED_VERSION_dbus = "0.23"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 8108b2b767..df20c0647a 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -4,6 +4,10 @@
FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable"
+DISTRO_NAME = "Unslung"
+DISTRO_VERSION = "4.5-alpha"
+DISTRO_TYPE = "beta"
+
TARGET_FPU = "soft"
TARGET_OS = "linux"
@@ -20,17 +24,14 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEV
EXTRA_IMAGEDEPENDS += 'unslung-switchbox-payload'
NSLU2_SLUGIMAGE_ARGS = -l payload.tar.gz
-UNSLUNG_EXTRA_PACKAGES +=
-
-UNSLUNG_EXTRA_DEPENDS +=
+UNSLUNG_EXTRA_DEPENDS ?= ""
+UNSLUNG_EXTRA_RDEPENDS ?= "\
+kernel-module-usbnet \
+kernel-module-pegasus kernel-module-kaweth \
+kernel-module-usbserial \
+kernel-module-pl2303 kernel-module-ftdi-sio"
-UNSLUNG_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \
-kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \
-kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii \
-kernel-module-md kernel-module-raid0 kernel-module-raid1 kernel-module-raid5 \
-kernel-module-usb-serial kernel-module-appletalk kernel-module-ipddp"
-
-UNSLUNG_EXTRA_RRECOMMENDS +=
+UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
PREFERRED_VERSION_glibc ?= "2.2.5"
PREFERRED_VERSION_glibc-initial ?= "2.2.5"
diff --git a/packages/base-passwd/base-passwd-3.5.7/root-home.patch b/conf/machine/wl500g.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-passwd/base-passwd-3.5.7/root-home.patch
+++ b/conf/machine/wl500g.conf
diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt
index 600dfbcc5f..12b5d11b9f 100644
--- a/files/device_table-unslung.txt
+++ b/files/device_table-unslung.txt
@@ -35,6 +35,8 @@
/dev/tty c 644 0 0 4 0 0 1 10
/dev/ttyS c 644 0 0 4 64 0 1 2
/dev/ttyp c 644 0 0 3 0 0 1 10
+/dev/ttyUSB c 644 0 0 188 0 0 1 4
/dev/urandom c 644 0 0 1 9 - - -
+/dev/video0 c 644 0 0 81 0 - - -
/dev/zero c 666 0 0 1 5 - - -
/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/packages/dropbear/dropbear-0.43/configure.patch b/packages/base-passwd/base-passwd-3.5.9/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.43/configure.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/configure.patch
diff --git a/packages/dropbear/dropbear-0.43/allow-nopw.patch b/packages/base-passwd/base-passwd-3.5.9/nobash.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.43/allow-nopw.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/nobash.patch
diff --git a/packages/dropbear/dropbear-0.43/multi-binary.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.43/multi-binary.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
diff --git a/packages/base-passwd/base-passwd_3.5.7.bb b/packages/base-passwd/base-passwd_3.5.7.bb
deleted file mode 100644
index 7587653753..0000000000
--- a/packages/base-passwd/base-passwd_3.5.7.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "Base system password/group files."
-SECTION = "base"
-PR = "r4"
-LICENSE = "GPL"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://nobash.patch;patch=1 \
- file://root-home.patch;patch=1"
-
-inherit autotools
-
-FILES_${PN}-doc += "${docdir}"
-
-do_install () {
- install -d -m 755 ${D}${sbindir}
- install -p -m 755 update-passwd ${D}${sbindir}/
- install -d -m 755 \
- ${D}${mandir}/man8 ${D}${mandir}/pl/man8
- install -p -m 644 man/update-passwd.8 \
- ${D}${mandir}/man8/
- install -p -m 644 man/update-passwd.pl.8 \
- ${D}${mandir}/pl/man8/update-passwd.8
- gzip -9 ${D}${mandir}/man8/* \
- ${D}${mandir}/pl/man8/*
- install -d -m 755 ${D}${datadir}/base-passwd
- install -p -m 644 passwd.master \
- ${D}${datadir}/base-passwd/
- install -p -m 644 group.master \
- ${D}${datadir}/base-passwd/
-
- install -d -m 755 ${D}${docdir}/${PN}
- install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
- gzip -9 ${D}${docdir}/${PN}/*
- install -p -m 644 README ${D}${docdir}/${PN}/
- install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
-}
-
-
-do_install_append_ramses() {
- echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
-}
-
-
-pkg_postinst () {
- set -e
-
- if [ ! -e $D${sysconfdir}/passwd ] ; then
- cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
- fi
-
- if [ ! -e $D${sysconfdir}/group ] ; then
- cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
- fi
- exit 0
-}
diff --git a/packages/dropbear/dropbear-0.44/allow-nopw.patch b/packages/base-passwd/base-passwd_3.5.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/allow-nopw.patch
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
diff --git a/packages/dropbear/dropbear-0.44/configure.patch b/packages/bazaar/bazaar_1.2.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/configure.patch
+++ b/packages/bazaar/bazaar_1.2.bb
diff --git a/packages/dropbear/dropbear-0.44/fix-2kb-keys.patch b/packages/bazaar/files/import_dirarg.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/fix-2kb-keys.patch
+++ b/packages/bazaar/files/import_dirarg.patch
diff --git a/packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch b/packages/bazaar/files/no_archive_format_guess_msg.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch
+++ b/packages/bazaar/files/no_archive_format_guess_msg.patch
diff --git a/packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch b/packages/cumulus/cumulus_1.2.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch
+++ b/packages/cumulus/cumulus_1.2.1.bb
diff --git a/packages/cumulus/cumulus_1.2.bb b/packages/cumulus/cumulus_1.2.bb
deleted file mode 100644
index 01af252e44..0000000000
--- a/packages/cumulus/cumulus_1.2.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-APPTYPE = "binary"
-APPNAME = "cumulus"
-APPDESKTOP = "${S}"
-PR = "r0"
-
-SRC_URI = "http://cumulus.kflog.org/download/src/cumulus-${PV}.src.tar.bz2 \
- file://qtooltip.patch;patch=1"
-S = "${WORKDIR}/cumulus-arm-${PV}/cumulus"
-
-inherit opie
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
-
-#
-# nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory
-#
-do_compile() {
- qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro
- oe_runmake
- qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro
- oe_runmake
-}
-
-do_install() {
- install -d ${D}${palmtopdir}/pics/mapicons
- install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus.png
- cp -a map-icons/* ${D}${palmtopdir}/pics/mapicons
-
- install -m 0755 gpsClient ${D}${palmtopdir}/bin/
-}
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index d6f8e51064..1fda3d2fde 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -7,13 +7,15 @@ APPTYPE = "binary"
APPNAME = "cumulus"
APPDESKTOP = "${S}"
PV = "1.2+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://cumulus.kflog.org/download/snapshot/cumulus-snapshot.tbz"
S = "${WORKDIR}/cumulus/cumulus"
inherit opie
+DEFAULT_PREFERENCE = "-1"
+
export OE_QMAKE_LINK="${CXX}"
EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
diff --git a/packages/dropbear/dropbear_0.43.bb b/packages/dropbear/dropbear_0.43.bb
deleted file mode 100644
index 957b88bc49..0000000000
--- a/packages/dropbear/dropbear_0.43.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Dropbear SSH Implementation"
-LICENSE = "MIT"
-DEPENDS = "zlib"
-PR = "r6"
-
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
- file://configure.patch;patch=1 \
- file://allow-nopw.patch;patch=1 \
- file://multi-binary.patch;patch=1 \
- file://init"
-S = "${WORKDIR}/dropbear-${PV}"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "dropbear"
-INITSCRIPT_PARAMS = "defaults 10"
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-
-do_compile () {
- oe_runmake dropbearmulti
-}
-
-do_install () {
- install -d ${D}${sysconfdir} \
- ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default \
- ${D}${sysconfdir}/dropbear \
- ${D}${sbindir} \
- ${D}${localstatedir}
-
- install -m 0755 dropbearmulti ${D}${sbindir}/
- cd ${D}${sbindir}/ && ln -s ./dropbearmulti dropbear && ln -s ./dropbearmulti dropbearkey && ln -s ./dropbearmulti dropbearconvert
-# autotools_do_install
- cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
- -e 's,/usr/sbin,${sbindir},g' \
- -e 's,/var,${localstatedir},g' \
- -e 's,/usr/bin,${bindir},g' \
- -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
- chmod 755 ${D}${sysconfdir}/init.d/dropbear
-}
-pkg_postinst_append () {
-
-if [ -n "$D" ]; then exit 1; fi
-if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
- dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
-fi
-#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-# dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
-#fi
-}
-
-pkg_postrm_append () {
-
-if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
-fi
-if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_dss_host_key
-fi
-}
diff --git a/packages/dropbear/dropbear_0.44.bb b/packages/dropbear/dropbear_0.44.bb
deleted file mode 100644
index 0812c71aa4..0000000000
--- a/packages/dropbear/dropbear_0.44.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
-SECTION = "console/network"
-LICENSE = "MIT"
-DEPENDS = "zlib"
-PR = "r2"
-
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
- file://use-urandom.patch;patch=1 \
- file://configure.patch;patch=1 \
- file://allow-nopw.patch;patch=1 \
- file://xauth-path.patch;patch=1 \
- file://fix-2kb-keys.patch;patch=1 \
- file://fix-ctrl-C-in-scp.patch;patch=1 \
- file://fix-empty-termode-problem.patch;patch=1 \
- file://init"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "dropbear"
-INITSCRIPT_PARAMS = "defaults 10"
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-
-SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
-BINCOMMANDS = "dbclient ssh scp"
-EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-
-do_install() {
- install -d ${D}${sysconfdir} \
- ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default \
- ${D}${sysconfdir}/dropbear \
- ${D}${bindir} \
- ${D}${sbindir} \
- ${D}${localstatedir}
-
- install -m 0755 dropbearmulti ${D}${sbindir}/
- for i in ${BINCOMMANDS}
- do
- ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
- done
- for i in ${SBINCOMMANDS}
- do
- ln -s ./dropbearmulti ${D}${sbindir}/$i
- done
- cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
- -e 's,/usr/sbin,${sbindir},g' \
- -e 's,/var,${localstatedir},g' \
- -e 's,/usr/bin,${bindir},g' \
- -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
- chmod 755 ${D}${sysconfdir}/init.d/dropbear
-}
-
-pkg_postrm_append () {
- if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
- fi
- if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_dss_host_key
- fi
-}
diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
index e69de29bb2..8a5d9bb47e 100644
--- a/packages/dropbear/dropbear_0.45.bb
+++ b/packages/dropbear/dropbear_0.45.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
+HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
+SECTION = "console/network"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PR = "r1"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+ file://urandom-xauth-changes-to-options.h.patch;patch=1 \
+ file://configure.patch;patch=1 \
+ file://allow-nopw.patch \
+ file://fix-2kb-keys.patch;patch=1 \
+ file://init"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
+BINCOMMANDS = "dbclient ssh scp"
+EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+
+do_configure_prepend() {
+ if [ "${DISTRO_TYPE}" == "debug" ]; then
+ patch -p1 < ${WORKDIR}/allow-nopw.patch
+ fi
+}
+
+do_install() {
+ install -d ${D}${sysconfdir} \
+ ${D}${sysconfdir}/init.d \
+ ${D}${sysconfdir}/default \
+ ${D}${sysconfdir}/dropbear \
+ ${D}${bindir} \
+ ${D}${sbindir} \
+ ${D}${localstatedir}
+
+ install -m 0755 dropbearmulti ${D}${sbindir}/
+ for i in ${BINCOMMANDS}
+ do
+ ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
+ done
+ for i in ${SBINCOMMANDS}
+ do
+ ln -s ./dropbearmulti ${D}${sbindir}/$i
+ done
+ cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+ -e 's,/usr/sbin,${sbindir},g' \
+ -e 's,/var,${localstatedir},g' \
+ -e 's,/usr/bin,${bindir},g' \
+ -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+ chmod 755 ${D}${sysconfdir}/init.d/dropbear
+}
+
+pkg_postrm_append () {
+ if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+ fi
+ if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+ fi
+}
diff --git a/packages/dropbear/dropbear-0.44/multi-binary.patch b/packages/gpe-contacts/gpe-contacts_0.36.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/multi-binary.patch
+++ b/packages/gpe-contacts/gpe-contacts_0.36.bb
diff --git a/packages/initscripts/initscripts-1.0/device_table.txt b/packages/initscripts/initscripts-1.0/device_table.txt
index 8d81d4ac57..aa2bbc2236 100644
--- a/packages/initscripts/initscripts-1.0/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/device_table.txt
@@ -10,7 +10,7 @@
/dev/audio3 c 660 0 29 14 52 - - -
/dev/bty c 644 0 0 60 0 0 1 5
/dev/sharp_fl c 640 0 44 254 0 - - -
-/dev/console c 662 0 5 5 1 - -
+/dev/console c 660 0 5 5 1 - -
/dev/cusa0 c 640 0 0 205 5 - - -
/dev/cusa1 c 640 0 0 205 6 - - -
/dev/cusa2 c 640 0 0 205 7 - - -
@@ -152,7 +152,7 @@
/dev/st1a c 660 0 11 9 97 - - -
/dev/st1l c 660 0 11 9 33 - - -
/dev/st1m c 660 0 11 9 65 - - -
-/dev/tty c 662 0 5 5 0 - - -
+/dev/tty c 664 0 5 5 0 - - -
/dev/tty c 666 0 5 4 0 0 1 9
/dev/ttyS c 640 0 5 4 64 0 1 4
/dev/ttySA c 640 0 5 204 5 0 1 4
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 6d0ea9a411..d5e9b5ee30 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r36"
+PR = "r37"
SRC_URI = "file://halt \
file://ramdisk \
diff --git a/packages/ipkg/ipkg-0.99.144/paths.patch b/packages/ipkg/ipkg-0.99.144/paths.patch
index df21491cad..f40131e252 100644
--- a/packages/ipkg/ipkg-0.99.144/paths.patch
+++ b/packages/ipkg/ipkg-0.99.144/paths.patch
@@ -97,15 +97,41 @@ Index: C/Makefile.am
BUILD_CPU=@build_cpu@
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\"
+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ \
-+ -DLIBDIR=\"$(libdir)\" -DIPKGDIR=\"$(ipkgdir)\"
++ -DLIBDIR=\"$(libdir)\" -DIPKGDIR=\"$(ipkgdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
bin_PROGRAMS = ipkg-cl
+Index: C/ipkg_conf.c
+===================================================================
+--- C.orig/ipkg_conf.c 2005-03-12 21:08:36.000000000 +1030
++++ C/ipkg_conf.c 2005-03-12 21:09:46.000000000 +1030
+@@ -103,7+103,7 @@
+ nv_pair_list_t tmp_dest_nv_pair_list;
+ char * lists_dir =NULL;
+ glob_t globbuf;
+- char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf";
++ char *etc_ipkg_conf_pattern = SYSCONFDIR"/ipkg/*.conf";
+ char *pending_dir =NULL;
+
+ memset(conf, 0, sizeof(ipkg_conf_t));
+Index: C/args.h
+===================================================================
+--- C.orig/args.h 2005-03-12 21:49:31.000000000 +1030
++++ C/args.h 2005-03-12 21:49:42.000000000 +1030
+@@ -43,7 +43,7 @@
+ };
+ typedef struct args args_t;
+
+-#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
++#define ARGS_DEFAULT_CONF_FILE_DIR SYSCONFDIR
+ #define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
+ #define ARGS_DEFAULT_DEST NULL
+ #define ARGS_DEFAULT_FORCE_DEFAULTS 0
Index: C/ipkg.h.in
===================================================================
--- C.orig/ipkg.h.in 2005-02-25 15:27:58.000000000 -0600
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,59 +0,0 @@
+@@ -1,60 +0,1 @@
-/* ipkg.h - the itsy package management system
-
- Carl D. Worth
diff --git a/packages/dropbear/dropbear-0.44/use-urandom.patch b/packages/kaffe/files/disable-automake-checks.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/use-urandom.patch
+++ b/packages/kaffe/files/disable-automake-checks.patch
diff --git a/packages/dropbear/dropbear-0.44/xauth-path.patch b/packages/kaffe/kaffe-gtk_cvs.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/dropbear/dropbear-0.44/xauth-path.patch
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
diff --git a/packages/qpegps/qpegps-0.9.1+cvs-20040817/gpsd-fix.patch b/packages/kaffe/kaffe-qt_cvs.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpegps/qpegps-0.9.1+cvs-20040817/gpsd-fix.patch
+++ b/packages/kaffe/kaffe-qt_cvs.bb
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kaffe/kaffe.inc
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kaffe/kaffeh-native_cvs.bb
diff --git a/packages/kbdd/files/kbdd-modules b/packages/kbdd/files/kbdd-modules
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kbdd/files/kbdd-modules
diff --git a/packages/kbdd/files/kbdd.conf b/packages/kbdd/files/kbdd.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kbdd/files/kbdd.conf
diff --git a/packages/kbdd/files/kbdd.init b/packages/kbdd/files/kbdd.init
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kbdd/files/kbdd.init
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index 2019f7eec9..5eb787d3f6 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -1,23 +1,45 @@
SECTION = "console/utils"
DESCRIPTION = "User-space keyboard daemon for external keyboards"
MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
-SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${CVSDATE}"
HOMEPAGE = "http://handhelds.org/moin/moin.cgi/kbdd"
LICENSE = "GPLv2"
+DEPENDS = "virtual/kernel"
+RDEPENDS = "kernel-module-keybdev kernel-module-uinput"
+SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${CVSDATE} \
+ file://kbdd.init \
+ file://kbdd.conf \
+ file://kbdd-modules"
PV="0.8+cvs-${CVSDATE}"
-PR="r2"
+PR="r3"
+inherit update-rc.d
S = "${WORKDIR}/kbdd"
-LICENSE = "GPL"
+INITSCRIPT_NAME = "kbdd"
+INITSCRIPT_PARAMS = "defaults"
+
do_compile() {
oe_runmake CFLAGS="${CFLAGS} -DVERSION=\\\"${PV}\\\""
}
do_install() {
- install -d ${D}${bindir}
+ install -d ${D}${sbindir}
install -d ${D}${docdir}/kbdd/
- install -m 0755 kbdd ${D}${bindir}/
+ install -m 0755 kbdd ${D}${sbindir}/
install -m 0644 README ${D}${docdir}/kbdd/
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/kbdd.conf ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/kbdd.init ${D}${sysconfdir}/init.d/kbdd
+ install -d ${D}${sysconfdir}/modutils
+ install -m 0644 ${WORKDIR}/kbdd-modules ${D}${sysconfdir}/modutils/
+}
+
+pkg_postinst () {
+ update-modules
+}
+
+pkg_postrm () {
+ update-modules
}
diff --git a/packages/kdepimpi/kdepimpi_2.0.17.bb b/packages/kdepimpi/kdepimpi_2.0.17.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/kdepimpi_2.0.17.bb
diff --git a/packages/libsamplerate/libsamplerate0_0.1.2.bb b/packages/libsamplerate/libsamplerate0_0.1.2.bb
index 1855efcf0a..b961d30b36 100644
--- a/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ b/packages/libsamplerate/libsamplerate0_0.1.2.bb
@@ -1,20 +1,17 @@
-LICENSE = GPL
-
DESCRIPTION = "An audio Sample Rate Conversion library"
SECTION = "libs"
-PRIORITY = "optional"
-
-inherit autotools pkgconfig
+LICENSE = "GPL libsamplerate"
+PR = "r1"
SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
-S="${WORKDIR}/libsamplerate-${PV}"
+S = "${WORKDIR}/libsamplerate-${PV}"
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libsamplerate.so.0 ${libdir}/libsamplerate.so.0.1.1 "
+inherit autotools pkgconfig
do_stage() {
oe_libinstall -a -so -C src libsamplerate ${STAGING_LIBDIR}
install -m 0644 ${S}/src/samplerate.h ${STAGING_INCDIR}/
}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/libsamplerate.so*"
diff --git a/packages/libsndfile/libsndfile1_1.0.11.bb b/packages/libsndfile/libsndfile1_1.0.11.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsndfile/libsndfile1_1.0.11.bb
diff --git a/packages/linux-hotplug/files/mmc.agent b/packages/linux-hotplug/files/mmc.agent
index e69de29bb2..c8f7026fe3 100644
--- a/packages/linux-hotplug/files/mmc.agent
+++ b/packages/linux-hotplug/files/mmc.agent
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# H3600 Sleeve hotplug policy agent for Linux 2.4 kernels
+#
+# Kernel NET hotplug params include:
+#
+# ACTION=%s [add or remove]
+# MEDIA=%s
+# SLOT=%d
+#
+
+. /etc/hotplug/hotplug.functions
+#DEBUG=yes export DEBUG
+
+ echo "Executing $0 action=$ACTION, media=$MEDIA ($SLOT)" > /dev/console
+
+MMC_MOUNT_OPTIONS="-t auto -o sync,noatime"
+
+if [ -f /etc/sysconfig/hotplug ] ; then
+ . /etc/sysconfig/hotplug
+fi
+
+case `uname -r` in
+2.4*)
+ devpath=mmc/part
+ ;;
+*)
+ devpath=mmcblk0p
+ ;;
+esac
+
+if [ "$ACTION" = "add" ] ; then
+ echo -n add > /dev/console
+ for n in 1 2 3 4 ; do
+ device=/dev/$devpath$n
+ if [ "$n" = "1" ] ; then
+ card=/mnt/card
+ else
+ card=/mnt/card$n
+ fi
+ [ -b $device ] || break
+ echo flash on $device > /dev/console
+ [ -d $card ] || mkdir -p $card
+ mount $MMC_MOUNT_OPTIONS $device $card
+ done
+
+else
+ for card in /mnt/card*; do
+ umount $card
+ done
+fi
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index e4cb823cab..75846a04de 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -7,6 +7,7 @@ RPROVIDES = "hotplug"
RCONFLICTS = "hotplug"
RREPLACES = "hotplug"
SECTION = "base"
+PR = "r1"
RSUGGESTS = "pciutils usbutils"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index 68bdc9b104..2ea9f77225 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,11 +5,11 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r4"
+PR = "r10"
-DOSRC="http://www.do13.in-berlin.de/openzaurus"
-RPSRC="http://www.rpsys.net/openzaurus/patches"
-JLSRC="http://www.cs.wisc.edu/~lenz/zaurus/files/"
+DOSRC = "http://www.do13.in-berlin.de/openzaurus"
+RPSRC = "http://www.rpsys.net/openzaurus/patches"
+JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/"
# Handy URLs
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
@@ -22,41 +22,45 @@ JLSRC="http://www.cs.wisc.edu/~lenz/zaurus/files/"
# ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \
# ${RPSRC}/corgi_kbd3-r5.patch;patch=1 \
# ${RPSRC}/sharp_multi_scoop-r2.patch;patch=1 \
+# When ready to upgrade to 2.6.12-rc1
+# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc1.bz2;patch=1 \
+# ${RPSRC}/input_power-r1.patch;patch=1 \
# Patches submitted upstream are towards top of this list
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
${RPSRC}/rndis_fix-r0.patch;patch=1 \
- ${RPSRC}/w100_malloc-r1.patch;patch=1 \
+ ${RPSRC}/w100_malloc-r2.patch;patch=1 \
${RPSRC}/pxairq_printk-r0.patch;patch=1 \
${RPSRC}/corgi_kbd-r14.patch;patch=1 \
${RPSRC}/corgi_ts-r10.patch;patch=1 \
+ ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \
+ ${RPSRC}/corgi_kbd1-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_param-r5.patch;patch=1 \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/pxa_irda-r1.patch;patch=1 \
- ${RPSRC}/corgi_kbd1-r0.patch;patch=1 \
- ${RPSRC}/pxaudc_susres-r0.patch;patch=1 \
- ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \
- ${RPSRC}/sharp_multi_pcmcia-r1.patch;patch=1 \
- ${RPSRC}/sharpsl_param-r3.patch;patch=1 \
+ ${RPSRC}/pxaudc_susres-r1.patch;patch=1 \
+ ${RPSRC}/sharp_multi_pcmcia-r1.patch;patch=1 \
+ ${RPSRC}/pxa_turbo-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \
${RPSRC}/input_power-r1.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
+ ${RPSRC}/corgi_irda-r2.patch;patch=1 \
${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${RPSRC}/corgi_power-r17.patch;patch=1 \
- ${RPSRC}/corgi_power1-r1.patch;patch=1 \
+ ${RPSRC}/corgi_power1-r1.patch;patch=1 \
${RPSRC}/ide_fixes-r1.patch;patch=1 \
${RPSRC}/mmc_sd-r4.patch;patch=1 \
${RPSRC}/corgi_snd-r4.patch;patch=1 \
- ${RPSRC}/w100_split-r2.patch;patch=1 \
+ ${RPSRC}/w100_split-r5.patch;patch=1 \
${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
${DOSRC}/tc6393-device-r2.patch;patch=1 \
${DOSRC}/tc6393_nand-r2.patch;patch=1 \
- ${DOSRC}/tosa-machine-base-r2.patch;patch=1 \
+ ${DOSRC}/tosa-machine-base-r4.patch;patch=1 \
${DOSRC}/tosa-keyboard-r2.patch;patch=1 \
- ${DOSRC}/tc6393fb-r1.patch;patch=1 \
+ ${DOSRC}/tc6393fb-r3.patch;patch=1 \
${DOSRC}/tosa-power-r2.patch;patch=1 \
- ${DOSRC}/tosa-mmc-r1.patch;patch=1 \
- ${DOSRC}/sharpsl-flash-tosa-r0.patch;patch=1 \
+ ${DOSRC}/tosa-mmc-r2.patch;patch=1 \
${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
file://add-oz-release-string.patch;patch=1 \
@@ -69,15 +73,13 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
SRC_URI_append_collie = " ${RPSRC}/jl1/collie_keymap.patch;patch=1 "
SRC_URI_append_poodle = " ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
- ${RPSRC}/rpextra_poodle-r0.patch;patch=1 " "
+ ${RPSRC}/rpextra_poodle-r0.patch;patch=1 " "
SRC_URI_append_tosa = " ${DOSRC}/nand-readid-r0.patch;patch=1 \
${DOSRC}/ac97-r1.patch;patch=1 \
- ${DOSRC}/tosa-bl-r2.patch;patch=1 \
- ${DOSRC}/tosa-udc-r1.patch;patch=1 \
- ${DOSRC}/tosa-irda-r0.patch;patch=1 \
- ${RPSRC}/rpextra_tosa-r0.patch;patch=1 "
-# ${DOSRC}/tosa-pcmcia-r1.patch;patch=1 "
-
+ ${DOSRC}/tosa-detection-r0.patch;patch=1 \
+ ${DOSRC}/tosa-bl-r2.patch;patch=1 \
+ ${DOSRC}/tosa-udc-r2.patch;patch=1 \
+ ${DOSRC}/tosa-irda-r1.patch;patch=1 "
S = "${WORKDIR}/linux-2.6.11"
@@ -86,7 +88,7 @@ inherit kernel
##############################################################
# Compensate for sucky bootloader on all Sharp Zaurus models
#
-FILES_kernel = ""
+FILES_kernel-image = ""
ALLOW_EMPTY = 1
EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
diff --git a/packages/linux/linux-wrt-2.4.20/110-sch_htb.patch b/packages/linux/linux-wrt-2.4.20/110-sch_htb.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/110-sch_htb.patch
diff --git a/packages/linux/linux-wrt-2.4.20/120-openwrt.patch b/packages/linux/linux-wrt-2.4.20/120-openwrt.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/120-openwrt.patch
diff --git a/packages/linux/linux-wrt-2.4.20/130-nfsswap.patch b/packages/linux/linux-wrt-2.4.20/130-nfsswap.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/130-nfsswap.patch
diff --git a/packages/linux/linux-wrt-2.4.20/140-ebtables-brnf-5.patch b/packages/linux/linux-wrt-2.4.20/140-ebtables-brnf-5.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/140-ebtables-brnf-5.patch
diff --git a/packages/linux/linux-wrt-2.4.20/150-mppe-mppc-0.98.patch b/packages/linux/linux-wrt-2.4.20/150-mppe-mppc-0.98.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/150-mppe-mppc-0.98.patch
diff --git a/packages/linux/linux-wrt-2.4.20/160-expr.patch b/packages/linux/linux-wrt-2.4.20/160-expr.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/160-expr.patch
diff --git a/packages/linux/linux-wrt-2.4.20/2.4.20_broadcom_3_37_2_1109_US.patch b/packages/linux/linux-wrt-2.4.20/2.4.20_broadcom_3_37_2_1109_US.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/2.4.20_broadcom_3_37_2_1109_US.patch
diff --git a/packages/linux/linux-wrt-2.4.20/defconfig b/packages/linux/linux-wrt-2.4.20/defconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/defconfig
diff --git a/packages/linux/linux-wrt-2.4.20/diag.c b/packages/linux/linux-wrt-2.4.20/diag.c
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/diag.c
diff --git a/packages/linux/linux-wrt-2.4.20/gcc3.patch b/packages/linux/linux-wrt-2.4.20/gcc3.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/gcc3.patch
diff --git a/packages/linux/linux-wrt-2.4.20/gcc_mtune.patch b/packages/linux/linux-wrt-2.4.20/gcc_mtune.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/gcc_mtune.patch
diff --git a/packages/linux/linux-wrt-2.4.20/linux-2.4.20-mipscvs.patch b/packages/linux/linux-wrt-2.4.20/linux-2.4.20-mipscvs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/linux-2.4.20-mipscvs.patch
diff --git a/packages/linux/linux-wrt-2.4.20/linux-2.4.24-attribute-used.patch b/packages/linux/linux-wrt-2.4.20/linux-2.4.24-attribute-used.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/linux-2.4.24-attribute-used.patch
diff --git a/packages/linux/linux-wrt-2.4.20/nobcom.patch b/packages/linux/linux-wrt-2.4.20/nobcom.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt-2.4.20/nobcom.patch
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-wrt_2.4.20.bb
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index ce8a6408f6..b703e10886 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -7,7 +7,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20031107"
-PR = "r34"
+PR = "r35"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
ALLOW_EMPTY_kernel = "1"
@@ -77,7 +77,7 @@ CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT
#
# Compensate for sucky bootloader on all Sharp Zaurus models
#
-FILES_kernel = ""
+FILES_kernel-image = ""
EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
KERNEL_CCSUFFIX = "-2.95"
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index 0df9d1c3e7..2eed2036c0 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -6,7 +6,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20030509"
-PR = "r16"
+PR = "r17"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
@@ -47,7 +47,7 @@ inherit kernel
#
# Compensate for sucky bootloader on all Sharp Zaurus models
#
-FILES_kernel = ""
+FILES_kernel-image = ""
ALLOW_EMPTY = 1
KERNEL_CCSUFFIX = "-2.95"
diff --git a/packages/linux/unslung-able-kernel_2.3r25.bb b/packages/linux/unslung-able-kernel_2.3r25.bb
deleted file mode 100644
index 10691ad7ce..0000000000
--- a/packages/linux/unslung-able-kernel_2.3r25.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "kernel"
-
-UNSLUNG_VARIANT = "able"
-
-include unslung-standard-kernel_2.3r25.bb
-
-SRC_URI += ""
diff --git a/packages/linux/unslung-kernel-2.3r25/able/defconfig b/packages/linux/unslung-kernel-2.3r25/able/defconfig
deleted file mode 100644
index 93d47c08d7..0000000000
--- a/packages/linux/unslung-kernel-2.3r25/able/defconfig
+++ /dev/null
@@ -1,992 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_ARM=y
-# CONFIG_EISA is not set
-# CONFIG_SBUS is not set
-# CONFIG_MCA is not set
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_GENERIC_BUST_SPINLOCK is not set
-# CONFIG_GENERIC_ISA_DMA is not set
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-# CONFIG_ADVANCED_OPTIONS is not set
-# CONFIG_OBSOLETE is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_KMOD is not set
-
-#
-# System Type
-#
-# CONFIG_ARCH_ADIFCC is not set
-# CONFIG_ARCH_ANAKIN is not set
-# CONFIG_ARCH_ARCA5K is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP1200 is not set
-# CONFIG_ARCH_IXP2000 is not set
-CONFIG_ARCH_IXP425=y
-# CONFIG_ARCH_OMAHA is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_MX1ADS is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_RISCSTATION is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_AT91RM9200 is not set
-
-#
-# Archimedes/A5000 Implementations
-#
-# CONFIG_ARCH_ARC is not set
-# CONFIG_ARCH_A5K is not set
-
-#
-# Footbridge Implementations
-#
-# CONFIG_ARCH_CATS is not set
-# CONFIG_ARCH_PERSONAL_SERVER is not set
-# CONFIG_ARCH_EBSA285_ADDIN is not set
-# CONFIG_ARCH_EBSA285_HOST is not set
-# CONFIG_ARCH_NETWINDER is not set
-
-#
-# SA11x0 Implementations
-#
-# CONFIG_SA1100_ACCELENT is not set
-# CONFIG_SA1100_ASSABET is not set
-# CONFIG_ASSABET_NEPONSET is not set
-# CONFIG_SA1100_ADSAGC is not set
-# CONFIG_SA1100_ADSBITSY is not set
-# CONFIG_SA1100_ADSBITSYPLUS is not set
-# CONFIG_SA1100_BRUTUS is not set
-# CONFIG_SA1100_CEP is not set
-# CONFIG_SA1100_CERF is not set
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
-# CONFIG_SA1100_H3XXX is not set
-# CONFIG_H3600_SLEEVE is not set
-# CONFIG_SA1100_EXTENEX1 is not set
-# CONFIG_SA1100_FLEXANET is not set
-# CONFIG_SA1100_FREEBIRD is not set
-# CONFIG_SA1100_FRODO is not set
-# CONFIG_SA1100_GRAPHICSCLIENT is not set
-# CONFIG_SA1100_GRAPHICSMASTER is not set
-# CONFIG_SA1100_HACKKIT is not set
-# CONFIG_SA1100_BADGE4 is not set
-# CONFIG_SA1100_JORNADA720 is not set
-# CONFIG_SA1100_HUW_WEBPANEL is not set
-# CONFIG_SA1100_ITSY is not set
-# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_NANOENGINE is not set
-# CONFIG_SA1100_OMNIMETER is not set
-# CONFIG_SA1100_PANGOLIN is not set
-# CONFIG_SA1100_PLEB is not set
-# CONFIG_SA1100_PT_SYSTEM3 is not set
-# CONFIG_SA1100_SHANNON is not set
-# CONFIG_SA1100_SHERMAN is not set
-# CONFIG_SA1100_SIMPAD is not set
-# CONFIG_SA1100_SIMPUTER is not set
-# CONFIG_SA1100_PFS168 is not set
-# CONFIG_SA1100_VICTOR is not set
-# CONFIG_SA1100_XP860 is not set
-# CONFIG_SA1100_YOPY is not set
-# CONFIG_SA1100_USB is not set
-# CONFIG_SA1100_USB_NETLINK is not set
-# CONFIG_SA1100_USB_CHAR is not set
-# CONFIG_SA1100_SSP is not set
-
-#
-# IXP425 Implementation Options
-#
-CONFIG_ARCH_IXDP425=y
-# CONFIG_ARCH_IXCDP1100 is not set
-# CONFIG_ARCH_PRPMC1100 is not set
-# CONFIG_ARCH_IXP425_COYOTE is not set
-# CONFIG_ARCH_SE4000 is not set
-CONFIG_IXP425_SDRAM_SIZE=32
-# CONFIG_IXP425_LARGE_SDRAM is not set
-CONFIG_IXP425_PCI_ERRATA=y
-# CONFIG_IXP425_OS_TIMER1 is not set
-# CONFIG_XSCALE_PMU_TIMER is not set
-# CONFIG_IXP425_CSR is not set
-
-#
-# AT91RM9200 Implementations
-#
-# CONFIG_ARCH_AT91RM9200DK is not set
-
-#
-# CLPS711X/EP721X Implementations
-#
-# CONFIG_ARCH_AUTCPU12 is not set
-# CONFIG_ARCH_CDB89712 is not set
-# CONFIG_ARCH_CLEP7312 is not set
-# CONFIG_ARCH_EDB7211 is not set
-# CONFIG_ARCH_FORTUNET is not set
-# CONFIG_ARCH_GUIDEA07 is not set
-# CONFIG_ARCH_P720T is not set
-# CONFIG_ARCH_EP7211 is not set
-# CONFIG_ARCH_EP7212 is not set
-# CONFIG_ARCH_ACORN is not set
-# CONFIG_FOOTBRIDGE is not set
-# CONFIG_FOOTBRIDGE_HOST is not set
-# CONFIG_FOOTBRIDGE_ADDIN is not set
-CONFIG_CPU_32=y
-# CONFIG_CPU_26 is not set
-# CONFIG_CPU_ARM610 is not set
-# CONFIG_CPU_ARM710 is not set
-# CONFIG_CPU_ARM720T is not set
-# CONFIG_CPU_ARM920T is not set
-# CONFIG_CPU_ARM922T is not set
-# CONFIG_PLD is not set
-# CONFIG_CPU_ARM926T is not set
-# CONFIG_CPU_ARM1020 is not set
-# CONFIG_CPU_ARM1026 is not set
-# CONFIG_CPU_SA110 is not set
-# CONFIG_CPU_SA1100 is not set
-# CONFIG_CPU_32v3 is not set
-# CONFIG_CPU_32v4 is not set
-CONFIG_CPU_32v5=y
-CONFIG_CPU_XSCALE=y
-CONFIG_ARM_THUMB=y
-# CONFIG_XSCALE_PMU_TIMER is not set
-# CONFIG_XSCALE_CACHE_ERRATA is not set
-# CONFIG_XSCALE_BDI2000 is not set
-# CONFIG_DISCONTIGMEM is not set
-CONFIG_CPU_BIG_ENDIAN=y
-
-#
-# General setup
-#
-CONFIG_PCI=y
-CONFIG_PCI_AUTOCONFIG=y
-# CONFIG_ISA is not set
-# CONFIG_ISA_DMA is not set
-CONFIG_KERNEL_START=0xc0000000
-# CONFIG_ZBOOT_ROM is not set
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_PCI_NAMES=y
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
-CONFIG_NET=y
-CONFIG_SYSVIPC=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_KCORE_ELF=y
-# CONFIG_KCORE_AOUT is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_PM is not set
-# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_REDBOOT_PARTS=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_JEDEC is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_DRAGONIX is not set
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_SNAPGEODE is not set
-# CONFIG_MTD_NETteluC is not set
-# CONFIG_MTD_MBVANILLA is not set
-# CONFIG_MTD_KeyTechnology is not set
-# CONFIG_MTD_NORA is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_CDB89712 is not set
-# CONFIG_MTD_SA1100 is not set
-# CONFIG_MTD_DC21285 is not set
-# CONFIG_MTD_IQ80310 is not set
-# CONFIG_MTD_EPXA10DB is not set
-# CONFIG_MTD_FORTUNET is not set
-# CONFIG_MTD_AUTCPU12 is not set
-CONFIG_MTD_IXP425=y
-# CONFIG_MTD_IXP425_COYOTE is not set
-# CONFIG_MTD_SE4000 is not set
-# CONFIG_MTD_EDB7312 is not set
-# CONFIG_MTD_IMPA7 is not set
-# CONFIG_MTD_CEIVA is not set
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PCMCIA is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_RAMDISK_DATA is not set
-# CONFIG_BLK_DEV_BLKMEM is not set
-# CONFIG_BLK_STATS is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=m
-CONFIG_BLK_DEV_MD=m
-# CONFIG_MD_LINEAR is not set
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_FILTER=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_MULTIPLE_TABLES is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_MULTIPATH_SEQUENTIAL is not set
-# CONFIG_IP_ROUTE_TOS is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_ARP_LIMIT is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-# CONFIG_SYN_COOKIES is not set
-
-#
-# IP: Netfilter Configuration
-#
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_KHTTPD is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_IPX is not set
-CONFIG_ATALK=y
-
-#
-# Appletalk devices
-#
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_IPSEC is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_ARM_AM79C961A is not set
-# CONFIG_ARM_CIRRUS is not set
-# CONFIG_IXP425_ETH is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_APRICOT is not set
-# CONFIG_B44 is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_TULIP is not set
-# CONFIG_DE4X5 is not set
-# CONFIG_DGRS is not set
-# CONFIG_DM9102 is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPRO100_PIO is not set
-# CONFIG_E100 is not set
-# CONFIG_LNE390 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139CP_EXTERNAL_PHY is not set
-CONFIG_8139CP_PHY_NUM=32
-# CONFIG_8139TOO is not set
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-# CONFIG_RTL8139 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNDANCE_MMIO is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_RHINE_FET is not set
-# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_NET_POCKET is not set
-# CONFIG_FEC is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_UCCS8900 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_MYRI_SBUS is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-# CONFIG_SLIP is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI support
-#
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SD_EXTRA_DEVS=40
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-CONFIG_SCSI_MULTI_LUN=n
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_NCR53C8XX is not set
-# CONFIG_SCSI_SYM53C8XX is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Input core support
-#
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Character devices
-#
-# CONFIG_LEDMAN is not set
-# CONFIG_DS1302 is not set
-# CONFIG_VT is not set
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_SERIAL_EXTENDED is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_PHILIPSPAR is not set
-# CONFIG_I2C_ELV is not set
-# CONFIG_I2C_VELLEMAN is not set
-# CONFIG_I2C_MCF_GPIO is not set
-CONFIG_I2C_IXP425=y
-# CONFIG_SCx200_I2C is not set
-# CONFIG_SCx200_ACB is not set
-# CONFIG_I2C_ALGOPCF is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_PROC is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-# CONFIG_82C710_MOUSE is not set
-# CONFIG_PC110_PAD is not set
-# CONFIG_MK712_MOUSE is not set
-
-#
-# Joysticks
-#
-# CONFIG_INPUT_GAMEPORT is not set
-# CONFIG_QIC02_TAPE is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_DEVICE_INTERFACE is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_IPMI_WATCHDOG is not set
-
-#
-# Controller Area Network Cards/Chips
-#
-# CONFIG_CAN4LINUX is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_AMD_PM768 is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-CONFIG_X1226_RTC=m
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# File systems
-#
-CONFIG_QUOTA=y
-CONFIG_QFMT_V2=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FAT_FS=y
-# CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
-CONFIG_VFAT_FS=y
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_CRAMFS is not set
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-CONFIG_DEVFS_FS=y
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_DMAPI is not set
-# CONFIG_XFS_TRACE is not set
-# CONFIG_XFS_DEBUG is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
-CONFIG_SUNRPC=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_SMB_FS=y
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_ZISOFS_FS is not set
-# CONFIG_COREDUMP_PRINTK is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-CONFIG_SMB_NLS=y
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# Misc devices
-#
-
-#
-# USB support
-#
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_UHCI=y
-# CONFIG_USB_UHCI_ALT is not set
-CONFIG_USB_OHCI=y
-# CONFIG_USB_SL811HS_ALT is not set
-# CONFIG_USB_SL811HS is not set
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_BLUETOOTH is not set
-# CONFIG_USB_MIDI is not set
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_HOTPLUG_SCSIDEV_NUMBER is not set
-CONFIG_USB_STORAGE_MAXTOR_ONETOUCH=y
-CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_DEBUG=y
-# CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_USB_EVENT is not set
-CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO=y
-CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO_APP_PATH="/sbin/onetouch"
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_ACM is not set
-CONFIG_USB_PRINTER=m
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HIDINPUT is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_DC2XX is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_SCANNER is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_HPUSBSCSI is not set
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_CATC=m
-CONFIG_USB_AX8817X=m
-CONFIG_USB_CDCETHER=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_TIGL is not set
-# CONFIG_USB_BRLVGER is not set
-# CONFIG_USB_LCD is not set
-
-#
-# Bluetooth support
-#
-CONFIG_BLUEZ=m
-CONFIG_BLUEZ_L2CAP=m
-CONFIG_BLUEZ_RFCOMM=m
-CONFIG_BLUEZ_BNEP=m
-CONFIG_BLUEZ_BNEP_MC_FILTER=y
-CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
-CONFIG_BLUEZ_HCIUSB=m
-
-#
-# Kernel hacking
-#
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_NO_PGT_CACHE is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_WAITQ is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_DC21285_PORT is not set
-# CONFIG_DEBUG_CLPS711X_UART2 is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_CRC32=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/unslung-kernel-2.3r25/defconfig b/packages/linux/unslung-kernel-2.3r25/defconfig
index c997bb8dc9..5691a8b41b 100644
--- a/packages/linux/unslung-kernel-2.3r25/defconfig
+++ b/packages/linux/unslung-kernel-2.3r25/defconfig
@@ -1,5 +1,5 @@
#
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
#
CONFIG_ARM=y
# CONFIG_EISA is not set
@@ -54,6 +54,10 @@ CONFIG_ARCH_IXP425=y
#
# Archimedes/A5000 Implementations
#
+
+#
+# Archimedes/A5000 Implementations (select only ONE)
+#
# CONFIG_ARCH_ARC is not set
# CONFIG_ARCH_A5K is not set
@@ -121,6 +125,10 @@ CONFIG_ARCH_IXDP425=y
# CONFIG_ARCH_PRPMC1100 is not set
# CONFIG_ARCH_IXP425_COYOTE is not set
# CONFIG_ARCH_SE4000 is not set
+
+#
+# IXP425 Options
+#
CONFIG_IXP425_SDRAM_SIZE=32
# CONFIG_IXP425_LARGE_SDRAM is not set
CONFIG_IXP425_PCI_ERRATA=y
@@ -149,6 +157,10 @@ CONFIG_IXP425_PCI_ERRATA=y
# CONFIG_FOOTBRIDGE is not set
# CONFIG_FOOTBRIDGE_HOST is not set
# CONFIG_FOOTBRIDGE_ADDIN is not set
+
+#
+# Processor Type
+#
CONFIG_CPU_32=y
# CONFIG_CPU_26 is not set
# CONFIG_CPU_ARM610 is not set
@@ -167,6 +179,10 @@ CONFIG_CPU_32=y
CONFIG_CPU_32v5=y
CONFIG_CPU_XSCALE=y
CONFIG_ARM_THUMB=y
+
+#
+# Processor Features
+#
# CONFIG_XSCALE_PMU_TIMER is not set
# CONFIG_XSCALE_CACHE_ERRATA is not set
# CONFIG_XSCALE_BDI2000 is not set
@@ -191,6 +207,10 @@ CONFIG_NET=y
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
+
+#
+# At least one math emulation must be selected
+#
CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
@@ -201,7 +221,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_PM is not set
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
+CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/ram0 rw init=/linuxrc initrd=0x01000000,10M mem=32M@0x00000000"
CONFIG_ALIGNMENT_TRAP=y
#
@@ -219,6 +239,10 @@ CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_REDBOOT_PARTS=y
# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
@@ -278,6 +302,10 @@ CONFIG_MTD_IXP425=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLKMTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
# CONFIG_MTD_DOC1000 is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
@@ -318,7 +346,7 @@ CONFIG_BLK_DEV_INITRD=y
#
# Multi-device support (RAID and LVM)
#
-CONFIG_MD=m
+CONFIG_MD=y
CONFIG_BLK_DEV_MD=m
# CONFIG_MD_LINEAR is not set
CONFIG_MD_RAID0=m
@@ -370,13 +398,22 @@ CONFIG_IP_PNP_BOOTP=y
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
+
+#
+#
+#
# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
+CONFIG_ATALK=y
#
# Appletalk devices
#
-# CONFIG_DEV_APPLETALK is not set
+CONFIG_DEV_APPLETALK=y
+# CONFIG_COPS_DAYNA is not set
+# CONFIG_COPS_TANGENT is not set
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_X25 is not set
@@ -491,7 +528,14 @@ CONFIG_8139CP_PHY_NUM=32
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
#
@@ -533,14 +577,22 @@ CONFIG_8139CP_PHY_NUM=32
# SCSI support
#
CONFIG_SCSI=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_BLK_DEV_SR is not set
# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
# CONFIG_SCSI_DEBUG_QUEUES is not set
-CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -667,6 +719,14 @@ CONFIG_PSMOUSE=y
# Joysticks
#
# CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
# CONFIG_QIC02_TAPE is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_IPMI_PANIC_EVENT is not set
@@ -702,7 +762,37 @@ CONFIG_X1226_RTC=m
#
# Multimedia devices
#
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+# CONFIG_VIDEO_PROC_FS is not set
+# CONFIG_I2C_PARPORT is not set
+
+#
+# Video Adapters
+#
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_ZORAN_BUZ is not set
+# CONFIG_VIDEO_ZORAN_DC10 is not set
+# CONFIG_VIDEO_ZORAN_LML33 is not set
+# CONFIG_VIDEO_ZR36120 is not set
+# CONFIG_VIDEO_MEYE is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_MIROPCM20 is not set
#
# File systems
@@ -732,6 +822,7 @@ CONFIG_VFAT_FS=y
# CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
# CONFIG_CRAMFS is not set
CONFIG_TMPFS=y
CONFIG_RAMFS=y
@@ -875,17 +966,32 @@ CONFIG_NLS_DEFAULT="iso8859-1"
#
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
+
+#
+# USB Host Controller Drivers
+#
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_UHCI=y
# CONFIG_USB_UHCI_ALT is not set
CONFIG_USB_OHCI=y
# CONFIG_USB_SL811HS_ALT is not set
# CONFIG_USB_SL811HS is not set
+
+#
+# USB Device Class drivers
+#
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_BLUETOOTH is not set
+
+#
+# USB Bluetooth can only be used with disabled Bluetooth subsystem
+#
# CONFIG_USB_MIDI is not set
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set
@@ -904,8 +1010,16 @@ CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO_APP_PATH="/sbin/onetouch"
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
+CONFIG_USB_PRINTER=m
+
+#
+# USB Human Interface Devices (HID)
+#
# CONFIG_USB_HID is not set
+
+#
+# Input core support is needed for USB HID input layer or HIDBP support
+#
# CONFIG_USB_HIDINPUT is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_KBD is not set
@@ -914,11 +1028,33 @@ CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO_APP_PATH="/sbin/onetouch"
# CONFIG_USB_WACOM is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
+
+#
+# USB Imaging devices
+#
# CONFIG_USB_DC2XX is not set
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_SCANNER is not set
# CONFIG_USB_MICROTEK is not set
# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+CONFIG_USB_OV511=m
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# USB Network adaptors
+#
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_KAWETH=m
@@ -926,12 +1062,41 @@ CONFIG_USB_CATC=m
CONFIG_USB_AX8817X=m
CONFIG_USB_CDCETHER=m
CONFIG_USB_USBNET=m
+
+#
+# USB port drivers
+#
# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
#
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_TIGL is not set
@@ -941,7 +1106,28 @@ CONFIG_USB_USBNET=m
#
# Bluetooth support
#
-# CONFIG_BLUEZ is not set
+CONFIG_BLUEZ=m
+CONFIG_BLUEZ_L2CAP=m
+# CONFIG_BLUEZ_SCO is not set
+CONFIG_BLUEZ_RFCOMM=m
+# CONFIG_BLUEZ_RFCOMM_TTY is not set
+CONFIG_BLUEZ_BNEP=m
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BLUEZ_HCIUSB=m
+# CONFIG_BLUEZ_USB_SCO is not set
+# CONFIG_BLUEZ_USB_ZERO_PACKET is not set
+# CONFIG_BLUEZ_HCIUART is not set
+# CONFIG_BLUEZ_HCIBFUSB is not set
+# CONFIG_BLUEZ_HCIDTL1 is not set
+# CONFIG_BLUEZ_HCIBT3C is not set
+# CONFIG_BLUEZ_HCIBLUECARD is not set
+# CONFIG_BLUEZ_HCIBTUART is not set
+# CONFIG_BLUEZ_HCIVHCI is not set
#
# Kernel hacking
diff --git a/packages/linux/unslung-kernel_2.3r25.bb b/packages/linux/unslung-kernel_2.3r25.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/unslung-kernel_2.3r25.bb
diff --git a/packages/linux/unslung-standard-kernel_2.3r25.bb b/packages/linux/unslung-standard-kernel_2.3r25.bb
deleted file mode 100644
index 65afe5f26d..0000000000
--- a/packages/linux/unslung-standard-kernel_2.3r25.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SECTION = "kernel"
-
-include nslu2-linksys-kernel_2.4.22.bb
-
-DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r11"
-
-UNSLUNG_VARIANT ?= "standard"
-KERNEL_SUFFIX = "unslung-${UNSLUNG_VARIANT}"
-
-CMDLINE_ROOT = "root=/dev/ram0 rw init=/linuxrc initrd=0x01000000,10M mem=32M@0x00000000"
-
-UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
-
-SRC_URI += "file://limit1gb.patch;patch=1 \
- file://gl811e.patch;patch=1 \
- file://ext3flash-on-disk1.patch;patch=1 \
- file://usbnet.patch;patch=1 \
- file://missing-usb-ioctls.patch;patch=1 \
- file://anonymiser.patch;patch=1 \
- file://ppp_mppe.patch;patch=1 \
- ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}/${UNSLUNG_VARIANT}', '${FILE_DIRNAME}/unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-python () {
- # Don't build unslung kernel unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- dist = bb.data.getVar("DISTRO", d, 1)
- if mach != 'nslu2' or dist != 'unslung':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
diff --git a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index e69de29bb2..ac00978c41 100644
--- a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Matchbox window manager extra themes"
+LICENSE = "GPL"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
+S = "${WORKDIR}/matchbox-themes-extra-${PV}"
+
+inherit autotools pkgconfig
+
+# split into several packages plus one meta package
+PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
+
+ALLOW_EMPTY_${PN} = 1
+FILES_${PN} = ""
+RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
+
+FILES_${PN}-industrial = "${datadir}/themes/Industrial \
+ ${datadir}/icons/Industrial"
+
+FILES_${PN}-expose = "${datadir}/themes/expose \
+ ${datadir}/icons/expose"
+
+FILES_${PN}-mbcrystal = "${datadir}/themes/mbcrystal \
+ ${datadir}/icons/mbcrystal"
diff --git a/packages/mbmerlin/mbmerlin_0.8.1-2.bb b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
index a79949f0b1..ce89d2101e 100644
--- a/packages/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -16,3 +16,4 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
S = "${WORKDIR}/mbmerlin"
+CFLAGS += " -D_GNU_SOURCE"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index fba4fdf9a1..058f4e4492 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE"
MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
SECTION = "opie/base"
ALLOW_EMPTY = 1
-PR = "r20"
+PR = "r21"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
@@ -10,7 +10,7 @@ PACKAGES = "task-opie-applets task-opie-applications task-opie-base \
task-opie-decorations task-opie-games task-opie-inputmethods \
task-opie-multimedia task-opie-pim task-opie-settings \
task-opie-styles task-opie-todayplugins task-opie-bluetooth \
- task-opie-wlan \
+ task-opie-wlan task-opie-datebookplugins \
task-qpe-applets task-qpe-games task-qpe-inputmethods \
task-qpe-multimedia task-qpe-emulators task-qpe-applications \
task-qpe-fonts task-qpe-settings"
@@ -298,7 +298,7 @@ opie-search \
opie-textedit \
opie-today \
opie-todo "
-RDEPENDS_task-opie-pim = "${task-opie-pim} task-opie-todayplugins"
+RDEPENDS_task-opie-pim = "${task-opie-pim} task-opie-todayplugins task-opie-datebookplugins"
DEPENDS += " ${task-opie-pim}"
task-kdepim = "\
@@ -358,6 +358,13 @@ opie-today-weatherplugin "
RDEPENDS_task-opie-todayplugins = "${task-opie-todayplugins}"
DEPENDS += " ${task-opie-todayplugins}"
+task-opie-datebookplugins= "\
+opie-datebook-birthdayplugin \
+opie-datebook-chrisholidayplugin \
+opie-datebook-nationalholidayplugin "
+RDEPENDS_task-opie-datebookplugins = "${task-opie-datebookplugins}"
+DEPENDS += " ${task-opie-datebookplugins}"
+
task-opie-bluetooth = "\
opie-bluepin \
opie-bluetoothmanager \
@@ -379,12 +386,22 @@ RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
DEPENDS += " ${task-qpe-emulators}"
task-qpe-fonts = "\
+qpf-bitstream-vera \
+qpf-bitstream-vera-sans-mono \
+qpf-dejavusans \
+qpf-dejavusansmono \
+qpf-dejavuserif \
+qpf-dejavuserifcondensed \
+qpf-freemono \
+qpf-freeserif \
+qpf-hunky \
+qpf-hunkysans \
+qpf-hunkyserif \
+qpf-qte \
qpf-helvetica \
qpf-unifont \
qpf-utopia \
terminus \
-qpf-bitstream-vera-sans-mono \
-qpf-bitstream-vera \
"
DEPENDS += " ${task-qpe-fonts}"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 5541a1e8c9..ba09c0249e 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -79,11 +79,9 @@ sectest-task-apps = "\
nmap \
ettercap \
stunnel \
- btscanner \
curl \
dsniff \
prismstumbler \
- dillo2 \
tcpdump \
miniclipboard"
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index e69de29bb2..efc550e9fe 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Packages that are compatible with the OpenSlug firmware"
+LICENSE = MIT
+PR = "r2"
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+OPENSLUG_PACKAGES = "\
+ atftp \
+ bash \
+ bluez-utils-nodbus \
+ coreutils \
+ miau \
+ microcom \
+ mgetty \
+ mt-daapd \
+ muxsshssl \
+ nail \
+ openssh \
+ ppp puppy \
+ strace sudo \
+ "
+
+BROKEN_PACKAGES = "\
+ "
+
+DEPENDS = 'openslug-image \
+ ${OPENSLUG_PACKAGES}'
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 1cfcda9ac6..aa87497f1f 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -23,7 +23,7 @@ OPIE_FONTS_LARGE = "qte-font-smoothsans-120 qte-font-smoothsans-140 qte-font-smo
OPIE_LIBS_DEPENDS = "qte libopie2 qpf-qte qpf-font-common"
OPIE_LIBS_RDEPENDS = "${OPIE_FONTS_SMALL}"
-OPIE_BASE = "opie-pics opie-sounds opie-qcop opie-quicklauncher opie-taskbar"
+OPIE_BASE = "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics opie-sounds"
#
# High res displays need some additional larger fonts
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index f7cade5495..723ce82832 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -33,7 +33,7 @@ def bootstrap_modutils_rdepends(d):
HOTPLUG ?= "linux-hotplug"
-DEPENDS = 'base-files base-passwd-3.5.7 \
+DEPENDS = 'base-files base-passwd-3.5.9 \
busybox dropbear initscripts modutils netbase \
sysvinit tinylogin portmap \
modutils-initscripts \
diff --git a/packages/meta/task-python-sharprom_0.9.0.bb b/packages/meta/task-python-sharprom_0.9.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/meta/task-python-sharprom_0.9.0.bb
diff --git a/packages/meta/unslung-able-image.bb b/packages/meta/unslung-able-image.bb
deleted file mode 100644
index b5337f0c4e..0000000000
--- a/packages/meta/unslung-able-image.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-IMAGE_VARIANT = "able"
-
-include unslung-standard-image.bb
-LICENSE = MIT
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index b2ed33a88d..48943b5d5f 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -1,4 +1,49 @@
-# Put the standard image last, so that the kernel modules that are built will work on both.
-DEPENDS = "unslung-able-image unslung-standard-image"
-EXCLUDE_FROM_WORLD = "1"
LICENSE = MIT
+PR = "r5"
+
+IMAGE_BASENAME = "unslung"
+
+IMAGE_LINGUAS = ""
+USE_DEVFS = "1"
+
+DEPENDS = "unslung-kernel unslung-rootfs \
+ glibc slingbox ipkg wget cpio findutils portmap-unslung \
+ ${UNSLUNG_EXTRA_DEPENDS}"
+
+IPKG_INSTALL = "unslung-rootfs \
+ libc6-unslung slingbox ipkg wget cpio findutils portmap-unslung \
+ ${UNSLUNG_EXTRA_INSTALL}"
+
+IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
+
+inherit image_ipk
+
+# Note that anything in this function must be repeatable without having to rebuild the rootfs
+unslung_clean_image () {
+ # Remove the patches
+ rm -rf ${IMAGE_ROOTFS}/patches
+ # Remove the kernel image
+ rm -rf ${IMAGE_ROOTFS}/boot
+ # Remove info from the local feed used to build the image
+ rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
+ rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
+ # Tidy up some thing which are in the wrong place
+ mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/
+ # Hack out the modutils stuff - it's too hard to make it work
+ rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/update-modules.postinst
+ rm -rf ${IMAGE_ROOTFS}/etc/rcS.d
+ echo "#!/bin/sh" > ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ echo "exit 0" >> ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ chmod ugo+x ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ echo "#!/bin/sh" > ${IMAGE_ROOTFS}/sbin/depmod
+ echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod
+ chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod
+}
+
+python () {
+ # Don't build unslung images unless we're targeting an nslu2
+ mach = bb.data.getVar("MACHINE", d, 1)
+ dist = bb.data.getVar("DISTRO", d, 1)
+ if mach != 'nslu2' or dist != 'unslung':
+ raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+}
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 22205c9573..53355d79e0 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,15 +1,15 @@
DESCRIPTION = "Packages that are compatible with the Unslung firmware"
-PR = "r1"
+LICENSE = MIT
+PR = "r2"
ALLOW_EMPTY = 1
PACKAGES = "${PN}"
-DEPENDS = ' \
- ${UNSLUNG_EXTRA_DEPENDS}'
+UNSLUNG_PACKAGES = "\
+ "
-RDEPENDS = ' \
- ${UNSLUNG_EXTRA_RDEPENDS}'
+BROKEN_PACKAGES = "\
+ "
-RRECOMMENDS = ' \
- ${UNSLUNG_EXTRA_RRECOMMENDS}'
-LICENSE = MIT
+DEPENDS = 'unslung-image \
+ ${UNSLUNG_PACKAGES}'
diff --git a/packages/meta/unslung-standard-image.bb b/packages/meta/unslung-standard-image.bb
deleted file mode 100644
index ae2bfd44fb..0000000000
--- a/packages/meta/unslung-standard-image.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-PR = "r3"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-UNSLUNG_BASE_DEPENDS = "glibc slingbox ipkg wget cpio findutils portmap-unslung"
-UNSLUNG_BASE_PACKAGES = "libc6-unslung slingbox ipkg wget cpio findutils portmap-unslung"
-
-IMAGE_VARIANT ?= "standard"
-
-export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}"
-
-IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-rootfs \
- ${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}"
-
-DEPENDS = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-rootfs \
- ${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}"
-
-RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}"
-
-RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}"
-
-IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-
-inherit image_ipk
-
-# Note that anything in this function must be repeatable without having to rebuild the rootfs
-unslung_clean_image () {
- # Remove info from the local feed used to build the image
- rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
- rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
-}
-
-python () {
- # Don't build unslung images unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- dist = bb.data.getVar("DISTRO", d, 1)
- if mach != 'nslu2' or dist != 'unslung':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
-LICENSE = MIT
diff --git a/packages/mt-daapd/mt-daapd_0.2.1.1.bb b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
index 5fe3961f7a..5015624f0d 100644
--- a/packages/mt-daapd/mt-daapd_0.2.1.1.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "zlib gdbm libid3tag"
PR = "r2"
LICENSE = "GPL"
-SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/mt-daapd-0.2.1.1.tar.gz \
+SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/mt-daapd/mt-daapd-0.2.1.1.tar.gz \
file://mt-daapd.init"
S = "${WORKDIR}/mt-daapd-0.2.1.1/"
diff --git a/packages/muxsshssl/muxsshssl_1.0.bb b/packages/muxsshssl/muxsshssl_1.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/muxsshssl/muxsshssl_1.0.bb
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nail/nail_11.21.bb
diff --git a/packages/neon/neon_0.24.7.bb b/packages/neon/neon_0.24.7.bb
index e69de29bb2..2e2ba4de59 100644
--- a/packages/neon/neon_0.24.7.bb
+++ b/packages/neon/neon_0.24.7.bb
@@ -0,0 +1,18 @@
+inherit autotools
+
+DEPENDS = "zlib libxml2 expat"
+SECTION = "base"
+LICENSE = "LGPL"
+DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
+PR = "r1"
+
+SRC_URI = "http://www.webdav.org/neon/neon-0.24.7.tar.gz \
+ file://no-func-checks.patch;patch=1"
+
+EXTRA_OECONF = " --without-ssl --with-libxml2 --with-expat \
+ --enable-shared --enable-static"
+
+do_stage () {
+ autotools_stage_includes
+ oe_libinstall -C src -so -a libneon ${STAGING_LIBDIR}/
+}
diff --git a/packages/netbase/netbase/wrt54/interfaces b/packages/netbase/netbase/wrt54/interfaces
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/wrt54/interfaces
diff --git a/packages/netbase/netbase_4.19.bb b/packages/netbase/netbase_4.19.bb
deleted file mode 100644
index c83037e137..0000000000
--- a/packages/netbase/netbase_4.19.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "This package provides the necessary \
-infrastructure for basic TCP/IP based networking."
-LICENSE = "GPL"
-PR = "r5"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "networking"
-INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
-
-SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
- file://options \
- file://init \
- file://hosts \
- file://interfaces"
-
-do_install () {
- install -d ${D}${sysconfdir}/init.d \
- ${D}${sbindir} \
- ${D}${mandir}/man8 \
- ${D}${sysconfdir}/network/if-pre-up.d \
- ${D}${sysconfdir}/network/if-up.d \
- ${D}${sysconfdir}/network/if-down.d \
- ${D}${sysconfdir}/network/if-post-down.d
- install -m 0644 ${WORKDIR}/options ${D}${sysconfdir}/network/options
- install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
- install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
- install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
- install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
- install -m 0644 etc-services ${D}${sysconfdir}/services
- install -m 0755 update-inetd ${D}${sbindir}/
- install -m 0644 update-inetd.8 ${D}${mandir}/man8/
- install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
-}
-
-CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
diff --git a/packages/netbase/netbase_4.20.bb b/packages/netbase/netbase_4.20.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase_4.20.bb
diff --git a/packages/nonworking/polypaudio/polypaudio_0.7.bb b/packages/nonworking/polypaudio/polypaudio_0.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/polypaudio/polypaudio_0.7.bb
diff --git a/packages/nslu2-binary-only/unslung-able-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-able-rootfs_2.3r25.bb
deleted file mode 100644
index b7958cd9c7..0000000000
--- a/packages/nslu2-binary-only/unslung-able-rootfs_2.3r25.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-UNSLUNG_VARIANT = "able"
-
-include unslung-standard-rootfs_2.3r25.bb
-
-# Add overlays and patches to the standard rootfs here
-SRC_URI += ""
-
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling
index c38774cd7d..4da1b9ba82 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling
@@ -1,31 +1,45 @@
#!/bin/sh
+usage="Usage: $0 [flash|hdd|flash-data|hdd-data|jffs2-flash|jffs2-hdd|jffs2-flash-data|jffs2-hdd-data]"
+
# Set or seach for target disk
if [ $# -gt 1 ] ; then
- echo "Usage: $0 [flash|hdd|flash-data|hdd-data]"
+ echo $usage
exit 1
fi
if [ $# -eq 1 ] ; then
if [ "$1" = "flash-data" ] ; then
targ=/share/flash/data
+ copy=true
elif [ "$1" = "hdd-data" ] ; then
targ=/share/hdd/data
+ copy=true
elif [ "$1" = "flash" ] ; then
targ=/share/flash/conf
+ copy=true
elif [ "$1" = "hdd" ] ; then
targ=/share/hdd/conf
+ copy=true
+ elif [ "$1" = "jffs2-flash-data" ] ; then
+ targ=/share/flash/data
+ copy=
+ elif [ "$1" = "jffs2-hdd-data" ] ; then
+ targ=/share/hdd/data
+ copy=
+ elif [ "$1" = "jffs2-flash" ] ; then
+ targ=/share/flash/conf
+ copy=
+ elif [ "$1" = "jffs2-hdd" ] ; then
+ targ=/share/hdd/conf
+ copy=
else
- echo "Usage: $0 [flash|hdd|flash-data|hdd-data]"
+ echo $usage
exit 1
fi
-elif [ -d /share/hdd/conf/lost+found ] ; then
- targ=/share/hdd/conf
-elif [ -d /share/flash/conf/lost+found ] ; then
- targ=/share/flash/conf
else
- echo "Cannot locate target disk"
+ echo $usage
exit 1
fi
@@ -42,45 +56,69 @@ fi
cd /
-# Ensure /opt is there.
+if [ -z "$copy" ] ; then
-if [ ! -d $targ/opt ] ; then
- echo "Creating new /opt directory on target disk."
- mkdir -p $targ/opt
-else
- echo "Preserving existing /opt directory on target disk."
-fi
+ # Ensure /opt is there.
+
+ if [ ! -d $targ/opt ] ; then
+ echo "Creating new /opt directory on target disk."
+ mkdir -p $targ/opt
+ else
+ echo "Preserving existing /opt directory on target disk."
+ fi
-if [ -d /opt -a ! -h /opt ] ; then
- echo "Copying existing /opt directory from root disk to target disk."
- tar cf - opt | ( cd $targ ; tar xf - )
- mv /opt /opt.old
-fi
+ if [ -d /opt -a ! -h /opt ] ; then
+ echo "Copying existing /opt directory from root disk to target disk."
+ tar cf - opt | ( cd $targ ; tar xf - )
+ mv /opt /opt.old
+ fi
-echo "Linking /opt directory from target disk to root disk."
-rm -f /opt ; ln -s $targ/opt /opt
+ echo "Linking /opt directory from target disk to root disk."
+ rm -f /opt ; ln -s $targ/opt /opt
-# Ensure /usr/lib/ipkg is there.
+ # Ensure /usr/lib/ipkg is there.
-if [ ! -d $targ/usr/lib/ipkg ] ; then
- echo "Creating new /usr/lib/ipkg directory on target disk."
- mkdir -p $targ/usr/lib/ipkg
-fi
+ if [ ! -d $targ/usr/lib/ipkg ] ; then
+ echo "Creating new /usr/lib/ipkg directory on target disk."
+ mkdir -p $targ/usr/lib/ipkg
+ fi
-if [ ! -f $targ/usr/lib/ipkg/status -a -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
- echo "Copying existing /usr/lib/ipkg directory from root disk to target disk."
- tar cf - usr/lib/ipkg | ( cd $targ ; tar xf - )
+ if [ ! -f $targ/usr/lib/ipkg/status -a -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
+ echo "Copying existing /usr/lib/ipkg directory from root disk to target disk."
+ tar cf - usr/lib/ipkg | ( cd $targ ; tar xf - )
+ else
+ echo "Preserving existing ipkg database on target disk."
+ fi
+
+ if [ -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
+ echo "Saving /usr/lib/ipkg directory on root disk in /usr/lib/ipkg.old"
+ rm -rf /usr/lib/ipkg.old
+ mv /usr/lib/ipkg /usr/lib/ipkg.old
+ fi
+
+ echo "Linking /usr/lib/ipkg directory from target disk to root disk."
+ rm -f /usr/lib/ipkg ; ln -s $targ/usr/lib/ipkg /usr/lib/ipkg
+
else
- echo "Preserving existing ipkg database on target disk."
-fi
-if [ -d /usr/lib/ipkg -a ! -h /usr/lib/ipkg ] ; then
- echo "Saving /usr/lib/ipkg directory on root disk in /usr/lib/ipkg.old"
- rm -rf /usr/lib/ipkg.old
- mv /usr/lib/ipkg /usr/lib/ipkg.old
-fi
+ # Copy the complete rootfs to the target.
+
+ /usr/bin/find / -print0 -mount | /usr/bin/cpio -p -0 -d -m -u $targ
+ rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
+ rm -rf $targ/var ; mv $targ/var.state $targ/var
+
+ rm -f /.sda1root /.sda2root /.sdb1root /.sdb2root
-echo "Linking /usr/lib/ipkg directory from target disk to root disk."
-rm -f /usr/lib/ipkg ; ln -s $targ/usr/lib/ipkg /usr/lib/ipkg
+ if [ "$targ" = "/share/hdd/data" ] ; then
+ echo > /.sda1root
+ elif [ "$targ" = "/share/hdd/conf" ] ; then
+ echo > /.sda2root
+ elif [ "$targ" = "/share/flash/data" ] ; then
+ echo > /.sdb1root
+ elif [ "$targ" = "/share/flash/conf" ] ; then
+ echo > /.sdb2root
+ fi
+
+fi
exit 0
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb
diff --git a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
deleted file mode 100644
index 15f0616838..0000000000
--- a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
+++ /dev/null
@@ -1,98 +0,0 @@
-SECTION = "base"
-
-PR = "r43"
-
-UNSLUNG_VERSION = "4.4-alpha"
-UNSLUNG_VARIANT ?= "standard"
-
-DEPENDS = "nslu2-linksys-libs"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-rootfs-${PV}/${UNSLUNG_VARIANT}', '${FILE_DIRNAME}/unslung-rootfs-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
- file://README \
- file://linuxrc \
- file://unsling \
- file://resling \
- file://rc.unslung-start \
- file://rc.unslung-stop \
- file://rc-diversion.patch;patch=1 \
- file://rc.1-diversion.patch;patch=1 \
- file://rc.crond-diversion.patch;patch=1 \
- file://rc.halt-diversion.patch;patch=1 \
- file://rc.local-diversion.patch;patch=1 \
- file://rc.modules-diversion.patch;patch=1 \
- file://rc.network-diversion.patch;patch=1 \
- file://rc.quickset-diversion.patch;patch=1 \
- file://rc.quota-diversion.patch;patch=1 \
- file://rc.reboot-diversion.patch;patch=1 \
- file://rc.reset_usrgrpshare-diversion.patch;patch=1 \
- file://rc.rstimezone-diversion.patch;patch=1 \
- file://rc.samba-diversion.patch;patch=1 \
- file://rc.sysinit-diversion.patch;patch=1 \
- file://rc.thttpd-diversion.patch;patch=1 \
- file://rc.xinetd-diversion.patch;patch=1 \
- file://root-passwd.patch;patch=1 \
- file://create-ramdisks.patch;patch=1 \
- file://remount-noatime.patch;patch=1 \
- file://initialise-mtab.patch;patch=1 \
- file://mount_usbdevfs.patch;patch=1 \
- file://maintmode.cgi file://upgrade-maint.htm file://upgrade-nomaint.htm \
- "
-
-S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25"
-
-python () {
- # Don't build unslung images unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- dist = bb.data.getVar("DISTRO", d, 1)
- if mach != 'nslu2' or dist != 'unslung':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
-
-do_compile () {
- echo "V2.3R25-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}" > ${S}/.unslung
-
- sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ ${S}/home/httpd/html/home.htm
- sed -i -e 's|>&nbsp;<|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \
- ${S}/home/httpd/html/manhead.htm
-
- # Somehow these two slipped through - this is easier than updating the tar file.
- rm -f ${S}/etc/rc.orig
- rm -f ${S}/etc/rc.d/rc.1.orig
-
- install -d ${S}/initrd
-
- install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc
- install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling
- install -m 755 ${WORKDIR}/resling ${S}/sbin/resling
- install -m 755 ${WORKDIR}/rc.unslung-start ${S}/etc/rc.d/rc.unslung-start
- install -m 755 ${WORKDIR}/rc.unslung-stop ${S}/etc/rc.d/rc.unslung-stop
-
- install -d ${S}/opt/doc
- install -m 755 ${WORKDIR}/README ${S}/opt/doc/README
- ln -s /opt/doc ${S}/home/httpd/html/Unslung
-
- # Remove the libraries, because they are in nslu2-linksys-libs now
- rm -rf ${S}/lib
-
- # Install maintenance mode files
- install -m 755 ${WORKDIR}/maintmode.cgi ${S}/home/httpd/html/Management
- install -m 644 ${WORKDIR}/upgrade-maint.htm ${S}/home/httpd/html/Management/upgrade-maint.htm
- install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade-nomaint.htm
- install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade.htm
- sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ \
- ${S}/home/httpd/html/Management/upgrade-maint.htm
- sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ \
- ${S}/home/httpd/html/Management/upgrade-nomaint.htm
- sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ \
- ${S}/home/httpd/html/Management/upgrade.htm
-}
-
-do_install () {
- ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - )
-}
-
-PACKAGES = "${PN}"
-FILES_${PN} = "/"
-RDEPENDS_${PN} = "nslu2-linksys-libs"
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index 3661ae052d..aca04b39c2 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/packages/openswan/openswan_2.2.0.bb
@@ -9,7 +9,7 @@ RRECOMMENDS = "kernel-module-ipsec"
RDEPENDS_nylon = "perl"
PR = "r3"
-SRC_URI = "http://www.openswan.org/code/openswan-${PV}.tar.gz \
+SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
file://openswan-2.2.0-gentoo.patch;patch=1 \
file://ld-library-path-breakage.patch;patch=1"
S = "${WORKDIR}/openswan-${PV}"
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
diff --git a/packages/pcmciautils/pcmciautils_001.bb b/packages/pcmciautils/pcmciautils_001.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils_001.bb
diff --git a/packages/pocketcellar/pocketcellar-1.1/cellardb.patch b/packages/pocketcellar/pocketcellar-1.1/cellardb.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pocketcellar/pocketcellar-1.1/cellardb.patch
diff --git a/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch b/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch
diff --git a/packages/pocketcellar/pocketcellar-1.1/winedb.patch b/packages/pocketcellar/pocketcellar-1.1/winedb.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pocketcellar/pocketcellar-1.1/winedb.patch
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index d8bf66873d..4b3ef77042 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -1,11 +1,16 @@
-DESCRIPTION = "Program for wine enthusiasts"
+DESCRIPTION = "Wine cellar manager. Allows you to record details of wines and \
+those you have in your cellar. The Food Assistant will make suggestions of wines \
+suitable for your meal, and indicate those in your cellar that match."
SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.gz \
+ file://winedb.patch;patch=1 \
+ file://cellardb.patch;patch=1 \
+ file://pocketcellar.patch;patch=1 \
file://gcc3.patch;patch=1"
inherit palmtop
@@ -16,14 +21,13 @@ do_install() {
install -d ${D}${palmtopdir}/bin \
${D}${palmtopdir}/apps/Applications \
${D}${palmtopdir}/pics \
- ${D}${palmtopdir}/data/PocketCellar
+ ${D}${palmtopdir}/data/PocketCellar
- install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/
-# BAD. packages -never- install files into home directories. ever. --CL
-# cp -a pkg-pcellar/home/root/Settings/* ${D}/home/root/Settings/
+ install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/
install -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/
install -m 644 pocketcellar.desktop ${D}${palmtopdir}/apps/Applications/
install -m 644 pocketcellar.png ${D}${palmtopdir}/pics/
+ install -m 644 pkg-pcellar/home/root/Settings/foodassist.conf ${D}${palmtopdir}/data/PocketCellar/
}
FILES_${PN} = "/"
diff --git a/packages/python/python-2.4.0-manifest.inc b/packages/python/python-2.4.0-manifest.inc
index 85ab52c16a..9e6c1da5ef 100644
--- a/packages/python/python-2.4.0-manifest.inc
+++ b/packages/python/python-2.4.0-manifest.inc
@@ -1,4 +1,4 @@
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael Lauer] on Sun Mar 13 16:12:54 2005
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael Lauer] on Sat Mar 19 20:48:56 2005
###
### Warning: Manual edits will be lost!
###
@@ -82,9 +82,9 @@ RDEPENDS_python-resource="python-core"
FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so "
DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml2"
+PR_python-math="ml3"
RDEPENDS_python-math="python-core"
-FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* "
+FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* "
DESCRIPTION_python-hotshot="Python Hotshot Profiler"
PR_python-hotshot="ml2"
diff --git a/packages/python/python_2.4.0.bb b/packages/python/python_2.4.0.bb
index d1819d64ed..b2cc57aba0 100644
--- a/packages/python/python_2.4.0.bb
+++ b/packages/python/python_2.4.0.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
PROVIDES = "python python-core"
DEPENDS = "python-native zlib gdbm"
-PR = "r0"
+PR = "r1"
PYTHON_MAJMIN = "2.4"
diff --git a/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb b/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb
deleted file mode 100644
index 0a6c708cb1..0000000000
--- a/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Navigation application for use with GPS adapters"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-HOMEPAGE = "http://qpegps.sourceforge.net/"
-CVSDATE = 20040817
-PV = "0.9.1+cvs-${CVSDATE}"
-PR = "r1"
-
-SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/qpegps;module=qpegps \
- file://gpsd-fix.patch;patch=1 \
- file://qpegps.desktop \
- file://qpegps.png"
-S = "${WORKDIR}/qpegps"
-
-inherit palmtop
-
-QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/qpegps \
- ${D}${palmtopdir}/help/html/qpegps_icons \
- ${D}${palmtopdir}/qpegps/maps \
- ${D}${palmtopdir}/qpegps/icons \
- ${D}${palmtopdir}/qpegps/tracks
- install -m 0755 qpegps ${D}${palmtopdir}/bin/
- install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
- install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
- install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
- install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
- install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
-}
diff --git a/packages/qpegps/qpegps_0.9.2.2.bb b/packages/qpegps/qpegps_0.9.2.2.bb
deleted file mode 100644
index de5d61addd..0000000000
--- a/packages/qpegps/qpegps_0.9.2.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Navigation application for use with GPS adapters"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-RRECOMMENDS = "gpsd"
-LICENSE = "GPL"
-HOMEPAGE = "http://qpegps.sourceforge.net/"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_0_9_2_2_src.zip \
- file://qpegps.desktop \
- file://qpegps.png"
-S = "${WORKDIR}/root/qpegps_src_my/qpegps_my"
-
-inherit palmtop
-
-QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/qpegps \
- ${D}${palmtopdir}/help/html/qpegps_icons \
- ${D}${palmtopdir}/qpegps/maps \
- ${D}${palmtopdir}/qpegps/icons \
- ${D}${palmtopdir}/qpegps/tracks
- install -m 0755 qpegps ${D}${palmtopdir}/bin/
- install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
- install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
- install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
- install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
- install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
- install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
-}
diff --git a/packages/qpegps/qpegps_0.9.2.3.bb b/packages/qpegps/qpegps_0.9.2.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpegps/qpegps_0.9.2.3.bb
diff --git a/packages/qte/qte-2.3.10/ipaq_sound_fix.patch b/packages/qte/qte-2.3.10/ipaq_sound_fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/ipaq_sound_fix.patch
diff --git a/packages/qte/qte-2.3.10/key.patch b/packages/qte/qte-2.3.10/key.patch
index e69de29bb2..c89f893517 100644
--- a/packages/qte/qte-2.3.10/key.patch
+++ b/packages/qte/qte-2.3.10/key.patch
@@ -0,0 +1,79 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-2.3.10/src/kernel/qkeyboard_qws.cpp~key 2005-03-19 15:44:15.120219000 +0100
++++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp 2005-03-19 15:43:43.247892000 +0100
+@@ -848,6 +848,9 @@
+ bool release = false;
+ int keypad = 0;
+
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // need autorepeat implemented here?
++ bool repeatable = TRUE;
++
+ #ifndef QT_QWS_USE_KEYCODES
+ #if defined(QT_QWS_IPAQ)
+ // map ipaq 'action' key (0x60, 0xe0)
+@@ -984,9 +987,6 @@
+ if ( currentKey )
+ keyCode = currentKey->key_code;
+
+-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // need autorepeat implemented here?
+- bool repeatable = TRUE;
+-
+ #if defined(QT_QWS_IPAQ)
+ switch (code) {
+ #if defined(QT_QWS_SL5XXX)
+@@ -1061,18 +1061,14 @@
+ repeatable = FALSE;
+ #endif
+
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+ if ( qt_screen->isTransformed()
+ && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down )
+ {
+ keyCode = xform_dirkey(keyCode);
+ }
+-
+-#ifdef QT_QWS_AUTOREPEAT_MANUALLY
+- if ( repeatable && !release )
+- rep->start(prevuni,prevkey,modifiers);
+- else
+- rep->stop();
+ #endif
++
+ #endif
+ /*
+ Translate shift+Key_Tab to Key_Backtab
+@@ -1234,6 +1230,14 @@
+ } else {
+ prevkey = prevuni = 0;
+ }
++
++#ifdef QT_QWS_AUTOREPEAT_MANUALLY
++ if ( repeatable && !release )
++ rep->start(prevuni,prevkey,modifiers);
++ else
++ rep->stop();
++#endif
++
+ }
+ #ifndef QT_QWS_USE_KEYCODES
+ extended = 0;
+@@ -2056,6 +2060,7 @@
+ press ? "press" : "release",
+ repeatable ? "true":"false" );
+
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+ if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
+ {
+ qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." );
+@@ -2063,6 +2068,7 @@
+ k = xform_dirkey( k );
+ qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k );
+ }
++#endif
+
+ if ( repeatable && press )
+ repeater->start( repeatdelay, true );
diff --git a/packages/qte/qte-2.3.10/ramses-keyboard.patch b/packages/qte/qte-2.3.10/ramses-keyboard.patch
deleted file mode 100644
index 61b5f302cf..0000000000
--- a/packages/qte/qte-2.3.10/ramses-keyboard.patch
+++ /dev/null
@@ -1,2339 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-2.3.10/src/kernel/qkeyboard_qws.cpp~ramses-keyboard
-+++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp
-@@ -1,5 +1,5 @@
- /****************************************************************************
--** $Id$
-+** $Id$
- **
- ** Implementation of Qt/Embedded keyboard drivers
- **
-@@ -37,7 +37,6 @@
- #include <qapplication.h>
- #include <qsocketnotifier.h>
- #include <qnamespace.h>
--#include <qdatetime.h>
- #include <qtimer.h>
-
- #include <stdlib.h>
-@@ -45,9 +44,7 @@
- #include <ctype.h>
-
- #include <unistd.h>
--#ifdef _OS_LINUX_
- #include <linux/kd.h>
--#endif
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -55,121 +52,13 @@
- #include <errno.h>
- #include <signal.h>
-
--#ifdef QT_QWS_TIP2
--#include <qcopchannel_qws.h>
--#endif
--
--//#define QT_QWS_USE_KEYCODES
--
- #ifndef QT_NO_QWS_KEYBOARD
-
--#ifdef QT_QWS_YOPY
--#include <qwidgetlist.h>
--#include <linux/kd.h>
--#include <linux/fb.h>
--#include <linux/yopy_button.h>
--extern "C" {
-- int getpgid(int);
--}
--#endif
--
--#if !defined(_OS_QNX6_)
--
- #include <termios.h>
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
- #include <sys/kd.h>
- #include <sys/vt.h>
--#endif
--
--/*
-- * SIMpad switches handler
-- * (C) 2003-2005 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-- */
--
--
--
--#include <linux/switches.h>
--#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches"
--
--// switches from left top to right down over the SIMpad surface
--
--#define SIMPAD_SWITCH_POWER 0x02
--#define SIMPAD_SWITCH_UPPER 0x10
--#define SIMPAD_SWITCH_UP 0x20
--#define SIMPAD_SWITCH_DOWN 0x40
--#define SIMPAD_SWITCH_LEFT 0x80
--#define SIMPAD_SWITCH_RIGHT 0x100
--#define SIMPAD_SWITCH_LOWER 0x8
--
--class QWSsimpadButtonsHandler : public QWSKeyboardHandler
--{
-- Q_OBJECT
--
-- public:
-- QWSsimpadButtonsHandler();
-- virtual ~QWSsimpadButtonsHandler();
--
-- bool isOpen() { return fd > 0; }
--
-- private slots:
-- void readSwitchesData();
-- void autoRepeat();
--
-- private:
-- switches_mask_t switches;
--
-- int fd;
-- int repeatdelay;
-- int repeatperiod;
--
-- int lastCode; // last native code
-- int lastPress; // last press/release state
--
-- int k; // last emitted Qt key code
-- int shiftKeyPressed; // true if one of the SHIFT keys has been pressed and not yet released
-- bool shiftUsed; // true if SHIFT has been used
--
-- QTime eventTimer; // tracks time between raw events
-- QTimer* repeater;
-- QSocketNotifier *notifier;
--};
--
--
--#ifdef QT_QWS_SL5XXX
--#include <asm/sharp_char.h>
--#endif
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
--#define QT_QWS_AUTOREPEAT_MANUALLY
--#endif
--
--
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
--static int dir_keyrot = -1;
--
--static int xform_dirkey(int key)
--{
-- if (dir_keyrot < 0) {
-- // get the rotation
-- char *kerot = getenv("QWS_CURSOR_ROTATION");
-- if (kerot) {
-- if (strcmp(kerot, "90") == 0)
-- dir_keyrot = 1;
-- else if (strcmp(kerot, "180") == 0)
-- dir_keyrot = 2;
-- else if (strcmp(kerot, "270") == 0)
-- dir_keyrot = 3;
-- else
-- dir_keyrot = 0;
-- } else {
-- dir_keyrot = 0;
-- }
-- }
-- int xf = qt_screen->transformOrientation() + dir_keyrot;
-- return (key-Qt::Key_Left+xf)%4+Qt::Key_Left;
--}
--#endif
-+#include <sys/wait.h>
-+#include <linux/keyboard.h>
-
- #define VTSWITCHSIG SIGUSR2
-
-@@ -177,374 +66,6 @@
- static int vtQws = 0;
- static int kbdFD = -1;
-
--class QWSyopyButtonsHandler : public QWSKeyboardHandler
--{
-- Q_OBJECT
--public:
-- QWSyopyButtonsHandler();
-- virtual ~QWSyopyButtonsHandler();
--
-- bool isOpen() { return buttonFD > 0; }
--
--private slots:
-- void readKeyboardData();
--
--private:
-- QString terminalName;
-- int buttonFD;
-- struct termios newT, oldT;
-- QSocketNotifier *notifier;
--};
--
--#endif // QNX6
--
--
--class QWSKeyboardRepeater : public QObject {
-- Q_OBJECT
--public:
-- static QWSKeyboardRepeater *current;
--
-- QWSKeyboardRepeater(QWSKeyboardHandler* parent) :
-- QObject(parent)
-- {
-- current = this;
-- repeatdelay = 400;
-- repeatperiod = 80;
-- repeater = new QTimer(this);
-- connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat()));
-- }
--
-- ~QWSKeyboardRepeater()
-- {
-- if ( current == this )
-- current = 0;
-- }
--
-- void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d;
-- if ( p > 0 ) repeatperiod=p;}
-- void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay;
-- if (p) *p=repeatperiod; }
--
-- void stop()
-- {
-- repeater->stop();
-- }
--
-- void start(int uni, int key, int mod)
-- {
-- runi = uni;
-- rkey = key;
-- rmod = mod;
-- repeater->start(repeatdelay,TRUE);
-- }
--
--private slots:
-- void autoRepeat();
--
--private:
-- int runi;
-- int rkey;
-- int rmod;
--
-- QTimer* repeater;
-- int repeatdelay, repeatperiod;
--};
--
--QWSKeyboardRepeater *QWSKeyboardRepeater::current=0;
--
--void QWSKeyboardRepeater::autoRepeat()
--{
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- qwsServer->processKeyEvent( runi, rkey, rmod, FALSE, TRUE );
-- qwsServer->processKeyEvent( runi, rkey, rmod, TRUE, TRUE );
-- repeater->start(repeatperiod);
--#endif
--}
--
--
--#ifdef QT_QWS_SL5XXX
--static const QWSServer::KeyMap keyM[] = {
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00
-- { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 01
-- { Qt::Key_B, 'b' , 'B' , 'B'-64 }, // 02
-- { Qt::Key_C, 'c' , 'C' , 'C'-64 }, // 03
-- { Qt::Key_D, 'd' , 'D' , 'D'-64 }, // 04
-- { Qt::Key_E, 'e' , 'E' , 'E'-64 }, // 05
-- { Qt::Key_F, 'f' , 'F' , 'F'-64 }, // 06
-- { Qt::Key_G, 'g' , 'G' , 'G'-64 }, // 07
-- { Qt::Key_H, 'h' , 'H' , 'H'-64 }, // 08
-- { Qt::Key_I, 'i' , 'I' , 'I'-64 }, // 09
-- { Qt::Key_J, 'j' , 'J' , 'J'-64 }, // 0a 10
-- { Qt::Key_K, 'k' , 'K' , 'K'-64 }, // 0b
-- { Qt::Key_L, 'l' , 'L' , 'L'-64 }, // 0c
-- { Qt::Key_M, 'm' , 'M' , 'M'-64 }, // 0d
-- { Qt::Key_N, 'n' , 'N' , 'N'-64 }, // 0e
-- { Qt::Key_O, 'o' , 'O' , 'O'-64 }, // 0f
-- { Qt::Key_P, 'p' , 'P' , 'P'-64 }, // 10
-- { Qt::Key_Q, 'q' , 'Q' , 'Q'-64 }, // 11
-- { Qt::Key_R, 'r' , 'R' , 'R'-64 }, // 12
-- { Qt::Key_S, 's' , 'S' , 'S'-64 }, // 13
-- { Qt::Key_T, 't' , 'T' , 'T'-64 }, // 14 20
-- { Qt::Key_U, 'u' , 'U' , 'U'-64 }, // 15
-- { Qt::Key_V, 'v' , 'V' , 'V'-64 }, // 16
-- { Qt::Key_W, 'w' , 'W' , 'W'-64 }, // 17
-- { Qt::Key_X, 'x' , 'X' , 'X'-64 }, // 18
-- { Qt::Key_Y, 'y' , 'Y' , 'Y'-64 }, // 19
-- { Qt::Key_Z, 'z' , 'Z' , 'Z'-64 }, // 1a
-- { Qt::Key_Shift, 0xffff , 0xffff , 0xffff }, // 1b
-- { Qt::Key_Return, 13 , 13 , 0xffff }, // 1c
-- { Qt::Key_F11, 0xffff , 0xffff , 0xffff }, // 1d todo
-- { Qt::Key_F22, 0xffff , 0xffff , 0xffff }, // 1e 30
-- { Qt::Key_Backspace, 8 , 8 , 0xffff }, // 1f
-- { Qt::Key_F31, 0xffff , 0xffff , 0xffff }, // 20
-- { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light
-- { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22
--
-- // Direction key code are for *UNROTATED* display.
-- { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23
-- { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24
-- { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25
-- { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26
--
-- { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK
-- { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home
-- { Qt::Key_1, '1' , 'q' , 'Q'-64 }, // 29
-- { Qt::Key_2, '2' , 'w' , 'W'-64 }, // 2a
-- { Qt::Key_3, '3' , 'e' , 'E'-64 }, // 2b
-- { Qt::Key_4, '4' , 'r' , 'R'-64 }, // 2c
-- { Qt::Key_5, '5' , 't' , 'T'-64 }, // 2d
-- { Qt::Key_6, '6' , 'y' , 'Y'-64 }, // 2e
-- { Qt::Key_7, '7' , 'u' , 'U'-64 }, // 2f
-- { Qt::Key_8, '8' , 'i' , 'I'-64 }, // 30
-- { Qt::Key_9, '9' , 'o' , 'O'-64 }, // 31
-- { Qt::Key_0, '0' , 'p' , 'P'-64 }, // 32 50
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 33
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 34
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 35
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 36
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 37
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 38
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 39
-- { Qt::Key_Minus, '-' , 'b' , 'B'-64 }, // 3a
-- { Qt::Key_Plus, '+' , 'n' , 'N'-64 }, // 3b
-- { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60
-- { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d
-- { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e
-- { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f
-- { Qt::Key_Period, '.' , '.' , 0xffff }, // 40
-- { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41
-- { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42
-- { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43
-- { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44
-- { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45
-- { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70
-- { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47
-- { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48
-- { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49
-- { Qt::Key_NumberSign, '#' , 'd' , 'D'-64 }, // 4a
-- { Qt::Key_Dollar, '$' , 'f' , 'F'-64 }, // 4b
-- { Qt::Key_Percent, '%' , 'g' , 'G'-64 }, // 4c
-- { Qt::Key_Underscore, '_' , 'h' , 'H'-64 }, // 4d
-- { Qt::Key_Ampersand, '&' , 'j' , 'J'-64 }, // 4e
-- { Qt::Key_Asterisk, '*' , 'k' , 'K'-64 }, // 4f
-- { Qt::Key_ParenLeft, '(' , 'l' , 'L'-64 }, // 50 80
-- { Qt::Key_Delete, '[' , '[' , '[' }, // 51
-- { Qt::Key_Z, 0xffff , 'z' , 'Z'-64 }, // 52
-- { Qt::Key_Equal, '=' , 'm' , 'M'-64 }, // 53
-- { Qt::Key_ParenRight, ')' , ']' , ']' }, // 54
-- { Qt::Key_AsciiTilde, '~' , '^' , '^' }, // 55
-- { Qt::Key_Less, '<' , '{' , '{' }, // 56
-- { Qt::Key_Greater, '>' , '}' , '}' }, // 57
-- { Qt::Key_F9, 0xffff , 0xffff , 0xffff }, // 58 datebook
-- { Qt::Key_F10, 0xffff , 0xffff , 0xffff }, // 59 address
-- { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // 5a 90 email
-- { Qt::Key_F30, ' ' , ' ' , 0xffff }, // 5b select
-- { Qt::Key_Space, ' ' , '|' , '`' }, // 5c
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 5d
-- { Qt::Key_Exclam, '!' , 'a' , 'A'-64 }, // 5e
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 5f
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 60
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 61
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 62
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66
-- { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6a
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6b
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6c
-- { Qt::Key_F34, 0xffff , 0xffff , 0xffff }, // 6d power
-- { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // 6e mail long
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6f
-- { Qt::Key_NumLock, 0xffff , 0xffff , 0xffff }, // 70
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 71
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 72
-- { 0x20ac, 0xffff , 0x20ac , 0x20ac }, // 73 Euro sign
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 74
-- { Qt::Key_F32, 0xffff , 0xffff , 0xffff }, // 75 Sync
-- { 0, 0xffff , 0xffff , 0xffff }
--};
--#else
--// Standard PC101
--static const QWSServer::KeyMap keyM[] = {
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Escape, 27 , 27 , 0xffff },
-- { Qt::Key_1, '1' , '!' , 0xffff },
-- { Qt::Key_2, '2' , '@' , 0xffff },
-- { Qt::Key_3, '3' , '#' , 0xffff },
-- { Qt::Key_4, '4' , '$' , 0xffff },
-- { Qt::Key_5, '5' , '%' , 0xffff },
-- { Qt::Key_6, '6' , '^' , 0xffff },
-- { Qt::Key_7, '7' , '&' , 0xffff },
-- { Qt::Key_8, '8' , '*' , 0xffff },
-- { Qt::Key_9, '9' , '(' , 0xffff }, // 10
-- { Qt::Key_0, '0' , ')' , 0xffff },
-- { Qt::Key_Minus, '-' , '_' , 0xffff },
-- { Qt::Key_Equal, '=' , '+' , 0xffff },
-- { Qt::Key_Backspace, 8 , 8 , 0xffff },
-- { Qt::Key_Tab, 9 , 9 , 0xffff },
-- { Qt::Key_Q, 'q' , 'Q' , 'Q'-64 },
-- { Qt::Key_W, 'w' , 'W' , 'W'-64 },
-- { Qt::Key_E, 'e' , 'E' , 'E'-64 },
-- { Qt::Key_R, 'r' , 'R' , 'R'-64 },
-- { Qt::Key_T, 't' , 'T' , 'T'-64 }, // 20
-- { Qt::Key_Y, 'y' , 'Y' , 'Y'-64 },
-- { Qt::Key_U, 'u' , 'U' , 'U'-64 },
-- { Qt::Key_I, 'i' , 'I' , 'I'-64 },
-- { Qt::Key_O, 'o' , 'O' , 'O'-64 },
-- { Qt::Key_P, 'p' , 'P' , 'P'-64 },
-- { Qt::Key_BraceLeft, '[' , '{' , 0xffff },
-- { Qt::Key_BraceRight, ']' , '}' , 0xffff },
-- { Qt::Key_Return, 13 , 13 , 0xffff },
-- { Qt::Key_Control, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 30
-- { Qt::Key_S, 's' , 'S' , 'S'-64 },
-- { Qt::Key_D, 'd' , 'D' , 'D'-64 },
-- { Qt::Key_F, 'f' , 'F' , 'F'-64 },
-- { Qt::Key_G, 'g' , 'G' , 'G'-64 },
-- { Qt::Key_H, 'h' , 'H' , 'H'-64 },
-- { Qt::Key_J, 'j' , 'J' , 'J'-64 },
-- { Qt::Key_K, 'k' , 'K' , 'K'-64 },
-- { Qt::Key_L, 'l' , 'L' , 'L'-64 },
-- { Qt::Key_Semicolon, ';' , ':' , 0xffff },
-- { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 40
-- { Qt::Key_QuoteLeft, '`' , '~' , 0xffff },
-- { Qt::Key_Shift, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Backslash, '\\' , '|' , 0xffff },
-- { Qt::Key_Z, 'z' , 'Z' , 'Z'-64 },
-- { Qt::Key_X, 'x' , 'X' , 'X'-64 },
-- { Qt::Key_C, 'c' , 'C' , 'C'-64 },
-- { Qt::Key_V, 'v' , 'V' , 'V'-64 },
-- { Qt::Key_B, 'b' , 'B' , 'B'-64 },
-- { Qt::Key_N, 'n' , 'N' , 'N'-64 },
-- { Qt::Key_M, 'm' , 'M' , 'M'-64 }, // 50
-- { Qt::Key_Comma, ',' , '<' , 0xffff },
-- { Qt::Key_Period, '.' , '>' , 0xffff },
-- { Qt::Key_Slash, '/' , '?' , 0xffff },
-- { Qt::Key_Shift, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Asterisk, '*' , '*' , 0xffff },
-- { Qt::Key_Alt, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Space, ' ' , ' ' , 0xffff },
-- { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F1, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F2, 0xffff , 0xffff , 0xffff }, // 60
-- { Qt::Key_F3, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F4, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F5, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F6, 0xffff , 0xffff , 0xffff },
--#if defined(QT_KEYPAD_MODE)
-- { Qt::Key_Menu, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Back, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Yes, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_No, 0xffff , 0xffff , 0xffff },
--#else
-- { Qt::Key_F7, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F8, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F9, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F10, 0xffff , 0xffff , 0xffff },
--#endif
-- { Qt::Key_NumLock, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_ScrollLock, 0xffff , 0xffff , 0xffff }, // 70
-- { Qt::Key_7, '7' , '7' , 0xffff },
-- { Qt::Key_8, '8' , '8' , 0xffff },
-- { Qt::Key_9, '9' , '9' , 0xffff },
-- { Qt::Key_Minus, '-' , '-' , 0xffff },
-- { Qt::Key_4, '4' , '4' , 0xffff },
-- { Qt::Key_5, '5' , '5' , 0xffff },
-- { Qt::Key_6, '6' , '6' , 0xffff },
-- { Qt::Key_Plus, '+' , '+' , 0xffff },
-- { Qt::Key_1, '1' , '1' , 0xffff },
-- { Qt::Key_2, '2' , '2' , 0xffff }, // 80
-- { Qt::Key_3, '3' , '3' , 0xffff },
-- { Qt::Key_0, '0' , '0' , 0xffff },
-- { Qt::Key_Period, '.' , '.' , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Less, '<' , '>' , 0xffff },
--#if defined(QT_KEYPAD_MODE)
-- { Qt::Key_Call, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Hangup, 0xffff , 0xffff , 0xffff },
--#else
-- { Qt::Key_F11, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F12, 0xffff , 0xffff , 0xffff },
--#endif
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Enter, 13 , 13 , 0xffff },
-- { Qt::Key_Control, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Slash, '/' , '/' , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 100
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // break
-- { Qt::Key_Home, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Up, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Prior, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Left, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Right, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_End, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Down, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Next, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Insert, 0xffff , 0xffff , 0xffff }, // 110
-- { Qt::Key_Delete, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // macro
-- { Qt::Key_F13, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_F14, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Help, 0xffff , 0xffff , 0xffff },
--#if defined(QT_KEYPAD_MODE)
-- { Qt::Key_Select, 0xffff , 0xffff , 0xffff }, // do
--#else
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // do
--#endif
-- { Qt::Key_F17, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Plus, '+' , '-' , 0xffff },
-- { Qt::Key_Pause, 0xffff , 0xffff , 0xffff }, // 120
-- { Qt::Key_F31, 0xffff , 0xffff , 0xffff }, // IM toggle
-- { Qt::Key_F32, 0xffff , 0xffff , 0xffff }, // Sync
-- { Qt::Key_F34, 0xffff , 0xffff , 0xffff }, // Power
-- { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // Backlight
--#if defined(QT_KEYPAD_MODE)
-- { Qt::Key_Context1, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Context2, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Context3, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_Context4, 0xffff , 0xffff , 0xffff },
--#else
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
-- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff },
--#endif
-- { 0, 0xffff , 0xffff , 0xffff }
--};
--#endif
--static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1;
- static QIntDict<QWSServer::KeyMap> *overrideMap = 0;
-
- /*!
-@@ -562,8 +83,6 @@
- overrideMap = map;
- }
-
--#if !defined(_OS_QNX6_)
--
- /*!
- \class QWSKeyboardHandler qkeyboard_qws.h
- \brief Keyboard driver/handler for Qt/Embedded
-@@ -597,114 +116,28 @@
- qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat );
- }
-
--class QWSPC101KeyboardHandler : public QWSKeyboardHandler
--{
-- Q_OBJECT
--public:
-- QWSPC101KeyboardHandler();
-- virtual ~QWSPC101KeyboardHandler();
--
-- void doKey(uchar scancode);
--
--
-- void restoreLeds();
-
--private:
-- bool shift;
-- bool alt;
-- bool ctrl;
--#if defined(QT_QWS_SL5XXX)
-- bool meta;
-- bool fn;
-- bool numLock;
--#endif
-- bool caps;
--#if defined(QT_QWS_IPAQ)
-- uint ipaq_return_pressed:1;
--#endif
--#ifndef QT_QWS_USE_KEYCODES
-- int extended;
--#endif
-- int modifiers;
-- int prevuni;
-- int prevkey;
--
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- QWSKeyboardRepeater *rep;
--#endif
--};
--
--void QWSPC101KeyboardHandler::restoreLeds()
-+bool qwsSetKeyboardAutoRepeat( int /* delay */ , int /* period */ )
- {
-- char leds;
-- ioctl(0, KDGETLED, &leds);
-- leds = leds & ~LED_CAP;
-- if ( caps ) leds |= LED_CAP;
-- ioctl(0, KDSETLED, leds);
-+ return FALSE;
- }
-
--class QWSTtyKeyboardHandler : public QWSPC101KeyboardHandler
--{
-- Q_OBJECT
--public:
-- QWSTtyKeyboardHandler(const QString&);
-- virtual ~QWSTtyKeyboardHandler();
--
--private slots:
-- void readKeyboardData();
--
--private:
-- struct termios origTermData;
--};
--
--
--// can't ifdef this out because moc runs on this file
--class QWSSamsungKeypadHandler : public QWSPC101KeyboardHandler
-+bool qwsGetKeyboardAutoRepeat( int /* delay */ , int /* period */ )
- {
-- Q_OBJECT
--public:
-- QWSSamsungKeypadHandler(const QString&);
-- virtual ~QWSSamsungKeypadHandler();
--
--private slots:
-- void readKeyboardData();
--};
-+ return FALSE;
-+}
-
--class QWSUsbKeyboardHandler : public QWSPC101KeyboardHandler
-+void qwsRestoreKeyboardLeds()
- {
-- Q_OBJECT
--public:
-- QWSUsbKeyboardHandler(const QString& device);
-- virtual ~QWSUsbKeyboardHandler();
-+}
-
--private slots:
-- void readKeyboardData();
-
--private:
-- int fd;
-- QWSServer::KeyMap *lastPress;
--};
-
--class QWSVr41xxButtonsHandler : public QWSKeyboardHandler
--{
-- Q_OBJECT
--public:
-- QWSVr41xxButtonsHandler();
-- virtual ~QWSVr41xxButtonsHandler();
-
-- bool isOpen() { return buttonFD > 0; }
--
--private slots:
-- void readKeyboardData();
-
--private:
-- QString terminalName;
-- int buttonFD;
-- int kbdIdx;
-- int kbdBufferLen;
-- unsigned char *kbdBuffer;
-- QSocketNotifier *notifier;
--};
-+/*
-+ * Virtual framebuffer keyboard driver
-+ */
-
- class QWSVFbKeyboardHandler : public QWSKeyboardHandler
- {
-@@ -727,1097 +160,393 @@
- QSocketNotifier *notifier;
- };
-
--
--static void vtSwitchHandler(int /*sig*/)
--{
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-- if (vtActive) {
-- qwsServer->enablePainting(false);
-- qt_screen->save();
-- if (ioctl(kbdFD, VT_RELDISP, 1) == 0) {
-- vtActive = false;
-- qwsServer->closeMouse();
-- }
-- else {
-- qwsServer->enablePainting(true);
-- }
-- usleep(200000);
-- }
-- else {
-- if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) {
-- qwsServer->enablePainting(true);
-- vtActive = true;
-- qt_screen->restore();
-- qwsServer->openMouse();
-- qwsServer->refresh();
-- }
-- }
-- signal(VTSWITCHSIG, vtSwitchHandler);
--#endif
--}
--
--//
--// PC-101 type keyboards
--//
--
--
--
--static QWSPC101KeyboardHandler *currentPC101=0;
--
--bool qwsSetKeyboardAutoRepeat( int delay, int period )
--{
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- if ( QWSKeyboardRepeater::current )
-- QWSKeyboardRepeater::current->setAutoRepeat( delay, period );
-- return QWSKeyboardRepeater::current != 0;
--#else
-- Q_UNUSED(delay);
-- Q_UNUSED(period);
-- return FALSE;
--#endif
--}
--
--bool qwsGetKeyboardAutoRepeat( int *delay, int *period )
--{
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- if ( QWSKeyboardRepeater::current )
-- QWSKeyboardRepeater::current->getAutoRepeat( delay, period );
-- return QWSKeyboardRepeater::current != 0;
--#else
-- Q_UNUSED(delay);
-- Q_UNUSED(period);
-- return FALSE;
-+#ifndef QT_NO_QWS_VFB
-+#include "qvfbhdr.h"
-+extern int qws_display_id;
- #endif
--}
-
--void qwsRestoreKeyboardLeds()
-+QWSVFbKeyboardHandler::QWSVFbKeyboardHandler()
- {
-- if ( currentPC101 )
-- currentPC101->restoreLeds();
--}
--
-+ kbdFD = -1;
-+#ifndef QT_NO_QWS_VFB
-+ kbdIdx = 0;
-+ kbdBufferLen = sizeof( QVFbKeyData ) * 5;
-+ kbdBuffer = new unsigned char [kbdBufferLen];
-
-+ terminalName = QString(QT_VFB_KEYBOARD_PIPE).arg(qws_display_id);
-
--QWSPC101KeyboardHandler::QWSPC101KeyboardHandler()
--{
-- shift = false;
-- alt = false;
-- ctrl = false;
--#ifndef QT_QWS_USE_KEYCODES
-- extended = 0;
--#endif
-- prevuni = 0;
-- prevkey = 0;
-- caps = FALSE;
--#if defined(QT_QWS_SL5XXX)
-- meta = FALSE;
-- fn = FALSE;
-+ if ((kbdFD = open( terminalName.local8Bit(), O_RDWR | O_NDELAY)) < 0) {
-+ qDebug( "Cannot open %s (%s)", terminalName.latin1(),
-+ strerror(errno));
-+ } else {
-+ // Clear pending input
-+ char buf[2];
-+ while (read(kbdFD, buf, 1) > 0) { }
-
-- numLock = FALSE;
-- sharp_kbdctl_modifstat st;
-- int dev = ::open("/dev/sharp_kbdctl", O_RDWR);
-- if( dev >= 0 ) {
-- memset(&st, 0, sizeof(st));
-- st.which = 3;
-- int ret = ioctl(dev, SHARP_KBDCTL_GETMODIFSTAT, (char*)&st);
-- if( !ret )
-- numLock = (bool)st.stat;
-- ::close(dev);
-+ notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this );
-+ connect(notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()));
- }
- #endif
--#if defined(QT_QWS_IPAQ)
-- // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 !
-- ipaq_return_pressed = FALSE;
--#endif
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- rep = new QWSKeyboardRepeater(this);
--#endif
-- currentPC101 = this;
- }
-
--QWSPC101KeyboardHandler::~QWSPC101KeyboardHandler()
-+QWSVFbKeyboardHandler::~QWSVFbKeyboardHandler()
- {
-- if ( currentPC101 == this )
-- currentPC101 = 0;
-+#ifndef QT_NO_QWS_VFB
-+ if ( kbdFD >= 0 )
-+ close( kbdFD );
-+ delete [] kbdBuffer;
-+#endif
- }
-
--void QWSPC101KeyboardHandler::doKey(uchar code)
-+
-+void QWSVFbKeyboardHandler::readKeyboardData()
- {
-- const QWSServer::KeyMap *currentKey = 0;
-- int keyCode = Qt::Key_unknown;
-- bool release = false;
-- int keypad = 0;
-+#ifndef QT_NO_QWS_VFB
-+ int n;
-+ do {
-+ n = read(kbdFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx );
-+ if ( n > 0 )
-+ kbdIdx += n;
-+ } while ( n > 0 );
-
--#ifndef QT_QWS_USE_KEYCODES
--#if defined(QT_QWS_IPAQ)
-- // map ipaq 'action' key (0x60, 0xe0)
-- if ((code & 0x7f) == 0x60) {
--#if defined(QT_KEYPAD_MODE)
-- // to keycode for select (keypad mode)
-- code = (code & 0x80) | 116;
--#else
-- // to keycode for space. (no keypad mode0
-- code = (code & 0x80) | 57;
--#endif
-+ int idx = 0;
-+ while ( kbdIdx - idx >= (int)sizeof( QVFbKeyData ) ) {
-+ QVFbKeyData *kd = (QVFbKeyData *)(kbdBuffer + idx);
-+ if ( kd->unicode == 0 && kd->modifiers == 0 && kd->press ) {
-+ // magic exit key
-+ qWarning( "Instructed to quit by Virtual Keyboard" );
-+ qApp->quit();
-+ }
-+ processKeyEvent( kd->unicode&0xffff, kd->unicode>>16,
-+ kd->modifiers, kd->press, kd->repeat );
-+ idx += sizeof( QVFbKeyData );
- }
--#endif
-
--#if !defined(QT_QWS_SL5XXX)
-- if (code == 224
--#if defined(QT_QWS_IPAQ)
-- && !ipaq_return_pressed
--#endif
-- ) {
-- // extended
-- extended = 1;
-- return;
-- }
-- else if (code == 225) {
-- // extended 2
-- extended = 2;
-- return;
-- }
--#endif
-+ int surplus = kbdIdx - idx;
-+ for ( int i = 0; i < surplus; i++ )
-+ kbdBuffer[i] = kbdBuffer[idx+i];
-+ kbdIdx = surplus;
- #endif
-+}
-
-
-- /*------------------------------------------------------------------
-- First find the Qt KeyCode
-- ------------------------------------------------------------------*/
--
-- if (code & 0x80) {
-- release = true;
-- code &= 0x7f;
-- }
--
--#ifndef QT_QWS_USE_KEYCODES
-- if (extended == 1) {
-- currentKey = overrideMap ? overrideMap->find( code+0xe000 ) : 0;
-- if ( currentKey )
-- keyCode = currentKey->key_code;
-- else
-- switch (code) {
-- case 72:
-- keyCode = Qt::Key_Up;
-- break;
-- case 75:
-- keyCode = Qt::Key_Left;
-- break;
-- case 77:
-- keyCode = Qt::Key_Right;
-- break;
-- case 80:
-- keyCode = Qt::Key_Down;
-- break;
-- case 82:
-- keyCode = Qt::Key_Insert;
-- break;
-- case 71:
-- keyCode = Qt::Key_Home;
-- break;
-- case 73:
-- keyCode = Qt::Key_Prior;
-- break;
-- case 83:
-- keyCode = Qt::Key_Delete;
-- break;
-- case 79:
-- keyCode = Qt::Key_End;
-- break;
-- case 81:
-- keyCode = Qt::Key_Next;
-- break;
-- case 28:
-- keyCode = Qt::Key_Enter;
-- break;
-- case 53:
-- keyCode = Qt::Key_Slash;
-- break;
-- case 0x1d:
-- keyCode = Qt::Key_Control;
-- break;
-- case 0x2a:
-- keyCode = Qt::Key_SysReq;
-- break;
-- case 0x38:
-- keyCode = Qt::Key_Alt;
-- break;
-- case 0x5b:
-- keyCode = Qt::Key_Super_L;
-- break;
-- case 0x5c:
-- keyCode = Qt::Key_Super_R;
-- break;
-- case 0x5d:
-- keyCode = Qt::Key_Menu;
-- break;
-- }
-- } else if ( extended == 2 ) {
-- switch (code) {
-- case 0x1d:
-- return;
-- case 0x45:
-- keyCode = Qt::Key_Pause;
-- break;
-- }
-- } else
--#endif
-- {
--#if defined(QT_QWS_SL5XXX)
-- if ( fn && !meta && (code >= 0x42 && code <= 0x52) ) {
-- ushort unicode=0xffff;
-- int scan=0;
-- if ( code == 0x42 ) { unicode='X'-'@'; scan=Key_X; } // Cut
-- else if ( code == 0x43 ) { unicode='C'-'@'; scan=Key_C; } // Copy
-- else if ( code == 0x44 ) { unicode='V'-'@'; scan=Key_V; } // Paste
-- else if ( code == 0x52 ) { unicode='Z'-'@'; scan=Key_Z; } // Undo
-- if ( scan ) {
-- processKeyEvent( unicode, scan, ControlButton, !release, FALSE );
-- return;
-- }
-- }
--#endif
-- currentKey = overrideMap ? overrideMap->find( code ) : 0;
-- if ( !currentKey && code < keyMSize ) {
-- currentKey = &QWSServer::keyMap()[code];
-- }
-- if ( currentKey )
-- keyCode = currentKey->key_code;
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // need autorepeat implemented here?
-- bool repeatable = TRUE;
-
--#if defined(QT_QWS_IPAQ)
-- switch (code) {
--#if defined(QT_QWS_SL5XXX)
--#if defined(QT_KEYPAD_MODE)
-- case 0x7a:
-- keyCode = Key_Call;
-- repeatable = FALSE;
-- break;
-- case 0x7b:
-- keyCode = Key_Context1;
-- repeatable = FALSE;
-- break;
-- case 0x7c:
-- keyCode = Key_Back;
-- repeatable = FALSE;
-- break;
-- case 0x7d:
-- keyCode = Key_Hangup;
-- repeatable = FALSE;
-- break;
--#else
-- case 0x7a: case 0x7b: case 0x7c: case 0x7d:
-- keyCode = code - 0x7a + Key_F9;
-- repeatable = FALSE;
-- break;
--#endif
-- case 0x79:
-- keyCode = Key_F34;
-- repeatable = FALSE;
-- break;
--#endif
-- case 0x78:
--# if defined(QT_QWS_IPAQ)
-- keyCode = Key_F24; // record
--# else
-- keyCode = Key_Escape;
--# endif
-- repeatable = FALSE;
-- break;
-- case 0x60:
-- keyCode = Key_Return;
--# ifdef QT_QWS_IPAQ
-- ipaq_return_pressed = !release;
--# endif
-- break;
-- case 0x67:
-- keyCode = Key_Right;
-- break;
-- case 0x69:
-- keyCode = Key_Up;
-- break;
-- case 0x6a:
-- keyCode = Key_Down;
-- break;
-- case 0x6c:
-- keyCode = Key_Left;
-- break;
-- }
--#endif
-
-- /*------------------------------------------------------------------
-- Then do special processing of magic keys
-- ------------------------------------------------------------------*/
-+struct termios origTermData;
-
-+static void init_kbd(void)
-+{
-+ struct termios termdata;
-
--#if defined(QT_QWS_SL5XXX)
-- if ( release && ( keyCode == Key_F34 || keyCode == Key_F35 ) )
-- return; // no release for power and light keys
-- if ( keyCode >= Key_F1 && keyCode <= Key_F35
-- || keyCode == Key_Escape || keyCode == Key_Home
-- || keyCode == Key_Shift || keyCode == Key_Meta )
-- repeatable = FALSE;
--#endif
-+ tcgetattr( kbdFD, &origTermData );
-+ tcgetattr( kbdFD, &termdata );
-
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-- if ( qt_screen->isTransformed()
-- && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down )
-- {
-- keyCode = xform_dirkey(keyCode);
-- }
--#endif
--
--#ifdef QT_QWS_AUTOREPEAT_MANUALLY
-- if ( repeatable && !release )
-- rep->start(prevuni,prevkey,modifiers);
-- else
-- rep->stop();
--#endif
--#endif
-- /*
-- Translate shift+Key_Tab to Key_Backtab
-- */
-- if (( keyCode == Key_Tab ) && shift )
-- keyCode = Key_Backtab;
-- }
-+ ioctl(kbdFD, KDSKBMODE, K_XLATE);
-
--#ifndef QT_QWS_USE_KEYCODES
-- /*
-- Keypad consists of extended keys 53 and 28,
-- and non-extended keys 55 and 71 through 83.
-- */
-- if (( extended == 1 ) ? (code == 53 || code == 28) :
-- (code == 55 || ( code >= 71 && code <= 83 )) )
-- keypad = Qt::Keypad;
--#else
-- if ( code == 55 || code >= 71 && code <= 83 || code == 96
-- || code == 98 || code == 118 )
-- keypad = Qt::Keypad;
--#endif
-+ termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
-+ termdata.c_oflag = 0;
-+ termdata.c_cflag = CREAD | CS8;
-+ termdata.c_lflag = 0;
-+ termdata.c_cc[VTIME]=0;
-+ termdata.c_cc[VMIN]=1;
-+ cfsetispeed(&termdata, 9600);
-+ cfsetospeed(&termdata, 9600);
-+ tcsetattr(kbdFD, TCSANOW, &termdata);
-+}
-
-- // Virtual console switching
-- int term = 0;
-- if (ctrl && alt && keyCode >= Qt::Key_F1 && keyCode <= Qt::Key_F10)
-- term = keyCode - Qt::Key_F1 + 1;
-- else if (ctrl && alt && keyCode == Qt::Key_Left)
-- term = QMAX(vtQws - 1, 1);
-- else if (ctrl && alt && keyCode == Qt::Key_Right)
-- term = QMIN(vtQws + 1, 10);
-- if (term && !release) {
-- ctrl = false;
-- alt = false;
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-- ioctl(kbdFD, VT_ACTIVATE, term);
--#endif
-- return;
-+static void done_kbd(void)
-+{
-+ if (kbdFD >= 0) {
-+ tcsetattr(kbdFD, TCSANOW, &origTermData);
- }
-+}
-
--#if defined(QT_QWS_SL5XXX)
-- // Ctrl-Alt-Delete exits qws
-- if (ctrl && alt && keyCode == Qt::Key_Delete) {
-- qApp->quit();
-+static void vtSwitchHandler(int /*sig*/)
-+{
-+ if (vtActive) {
-+ qwsServer->enablePainting(false);
-+ qt_screen->save();
-+ if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) {
-+ vtActive = false;
-+ qwsServer->closeMouse();
-+ done_kbd();
-+ }
-+ else {
-+ qwsServer->enablePainting(true);
-+ }
-+ usleep(200000);
- }
--#else
-- // Ctrl-Alt-Backspace exits qws
-- if (ctrl && alt && keyCode == Qt::Key_Backspace) {
-- qApp->quit();
-+ else {
-+ if (ioctl(kbdFD, VT_RELDISP, VT_ACKACQ) == 0) {
-+ init_kbd();
-+ qwsServer->enablePainting(true);
-+ vtActive = true;
-+ qt_screen->restore();
-+ qwsServer->openMouse();
-+ qwsServer->refresh();
-+ }
- }
--#endif
-+ signal(VTSWITCHSIG, vtSwitchHandler);
-+}
-
--#if defined(QT_QWS_SL5XXX)
-- if (keyCode == Qt::Key_F22) { /* Fn key */
-- fn = !release;
-- } else if ( keyCode == Key_NumLock ) {
-- if ( release )
-- numLock = !numLock;
-- } else
--#endif
-
-- if (keyCode == Qt::Key_Alt) {
-- alt = !release;
-- } else if (keyCode == Qt::Key_Control) {
-- ctrl = !release;
-- } else if (keyCode == Qt::Key_Shift) {
-- shift = !release;
--#if defined(QT_QWS_SL5XXX)
-- } else if (keyCode == Qt::Key_Meta) {
-- meta = !release;
--#endif
-- } else if ( keyCode == Qt::Key_CapsLock && release ) {
-- caps = !caps;
--#if defined(_OS_LINUX_) && !defined(QT_QWS_SL5XXX)
-- char leds;
-- ioctl(0, KDGETLED, &leds);
-- leds = leds & ~LED_CAP;
-- if ( caps ) leds |= LED_CAP;
-- ioctl(0, KDSETLED, leds);
--#endif
-- }
-
-- /*------------------------------------------------------------------
-- Then find the Unicode value and send the event
-- ------------------------------------------------------------------*/
-- //If we map the keyboard to a non-latin1 layout, we may have
-- //valid keys with unknown key codes.
-- if ( currentKey || keyCode != Qt::Key_unknown ) {
-- bool bAlt = alt;
-- bool bCtrl = ctrl;
-- bool bShift = shift;
-- int unicode = 0xffff;
-- if ( currentKey ) {
--#if !defined(QT_QWS_SL5XXX)
-- bool bCaps = shift ||
-- (caps ? QChar(QWSServer::keyMap()[code].unicode).isLetter() : FALSE);
--#else
-- bool bCaps = caps ^ shift;
-- if (fn) {
-- if ( shift ) {
-- bCaps = bShift = FALSE;
-- bCtrl = TRUE;
-- }
-- if ( meta ) {
-- bCaps = bShift = TRUE;
-- bAlt = TRUE;
-- }
-- } else if ( meta ) {
-- bCaps = bShift = TRUE;
-- }
-- if ( code > 40 && caps ) {
-- // fn-keys should only react to shift, not caps
-- bCaps = bShift = shift;
-- }
-- if ( numLock ) {
-- if ( keyCode != Key_Space && keyCode != Key_Tab )
-- bCaps = bShift = FALSE;
-- }
-- if ( keyCode == Key_Delete && (bAlt || bCtrl) ) {
-- keyCode = Key_BraceLeft;
-- unicode = '[';
-- bCaps = bShift = bAlt = bCtrl = FALSE;
-- } else if (keyCode == Qt::Key_F31 && bCtrl) {
-- keyCode = Key_QuoteLeft;
-- unicode = '`';
-- } else
--#endif
--
-- if (bCtrl)
-- unicode = currentKey->ctrl_unicode;
-- else if (bCaps)
-- unicode = currentKey->shift_unicode;
-- else
-- unicode = currentKey->unicode;
--#ifndef QT_QWS_USE_KEYCODES
-- } else if ( extended == 1 ) {
-- if ( keyCode == Qt::Key_Slash )
-- unicode = '/';
-- else if ( keyCode == Qt::Key_Enter )
-- unicode = 0xd;
--#endif
-- }
-+class QWSRamsesKbPrivate;
-+class QWSRamsesKeyboardHandler : public QWSKeyboardHandler
-+{
-+public:
-+ QWSRamsesKeyboardHandler( const QString& );
-+ virtual ~QWSRamsesKeyboardHandler();
-
-- modifiers = 0;
-- if ( bAlt ) modifiers |= AltButton;
-- if ( bCtrl ) modifiers |= ControlButton;
-- if ( bShift ) modifiers |= ShiftButton;
-- if ( keypad ) modifiers |= Keypad;
-+ virtual void processKeyEvent(int unicode, int keycode, int modifiers,
-+ bool isPress, bool autoRepeat);
-
-- // looks wrong -- WWA
-- bool repeat = FALSE;
-- if (prevuni == unicode && prevkey == keyCode && !release)
-- repeat = TRUE;
-+private:
-+ QWSRamsesKbPrivate *d;
-+};
-
-- processKeyEvent( unicode, keyCode, modifiers, !release, repeat );
-
-- if (!release) {
-- prevuni = unicode;
-- prevkey = keyCode;
-- } else {
-- prevkey = prevuni = 0;
-- }
-- }
--#ifndef QT_QWS_USE_KEYCODES
-- extended = 0;
--#endif
--}
-+class QWSRamsesKbPrivate : public QObject
-+{
-+ Q_OBJECT
-+public:
-+ QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *, const QString &device );
-+ ~QWSRamsesKbPrivate();
-
-+private slots:
-+ void readKeyboardData();
-
--//
--// Tty keyboard
--//
-+private:
-+ void handleKey(unsigned char code, int n);
-
--QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device)
-+ QWSRamsesKeyboardHandler *handler;
-+ char rbuf[255];
-+ int rptr;
-+};
-+
-+QWSRamsesKbPrivate::QWSRamsesKbPrivate( QWSRamsesKeyboardHandler *h, const QString &device )
-+ : handler(h), rptr(0)
- {
- #ifdef QT_QWS_DEVFS
-- kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0);
-+ kbdFD = ::open(device.isEmpty()?"/dev/vc/2":device.latin1(), O_RDWR|O_NDELAY, 0);
- #else
-- kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0);
-+ kbdFD = ::open(device.isEmpty()?"/dev/tty2":device.latin1(), O_RDWR|O_NDELAY, 0);
- #endif
-
- if ( kbdFD >= 0 ) {
-- QSocketNotifier *notifier;
-- notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL(activated(int)),this,
-- SLOT(readKeyboardData()) );
--
-- // save for restore.
-- tcgetattr( kbdFD, &origTermData );
--
-- struct termios termdata;
-- tcgetattr( kbdFD, &termdata );
--
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
--# ifdef QT_QWS_USE_KEYCODES
-- ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW);
--# else
-- ioctl(kbdFD, KDSKBMODE, K_RAW);
--# endif
--#endif
--
-- termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
-- termdata.c_oflag = 0;
-- termdata.c_cflag = CREAD | CS8;
-- termdata.c_lflag = 0;
-- termdata.c_cc[VTIME]=0;
-- termdata.c_cc[VMIN]=1;
-- cfsetispeed(&termdata, 9600);
-- cfsetospeed(&termdata, 9600);
-- tcsetattr(kbdFD, TCSANOW, &termdata);
--
-- signal(VTSWITCHSIG, vtSwitchHandler);
--
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-- struct vt_mode vtMode;
-- ioctl(kbdFD, VT_GETMODE, &vtMode);
--
-- // let us control VT switching
-- vtMode.mode = VT_PROCESS;
-- vtMode.relsig = VTSWITCHSIG;
-- vtMode.acqsig = VTSWITCHSIG;
-- ioctl(kbdFD, VT_SETMODE, &vtMode);
--
-- struct vt_stat vtStat;
-- ioctl(kbdFD, VT_GETSTATE, &vtStat);
-- vtQws = vtStat.v_active;
--#endif
-+ QSocketNotifier *notifier;
-+ notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this );
-+ connect( notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()) );
-+ } else {
-+ qDebug( "Cannot open keyboard" );
- }
--}
--
--QWSTtyKeyboardHandler::~QWSTtyKeyboardHandler()
--{
-- if (kbdFD >= 0)
-- {
-+ init_kbd();
-
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-- struct vt_mode vtMode;
-- ioctl(kbdFD, VT_GETMODE, &vtMode);
-+ struct vt_mode vtMode;
-+ ioctl(kbdFD, VT_GETMODE, &vtMode);
-
-- /* Mickey says: "Better give up control of VT switching.
-- * Hey, I really hate that OS-will-reacquire-resources on process-death
-- * kind of thinking!
-- */
-- vtMode.mode = VT_AUTO;
-- vtMode.relsig = 0;
-- vtMode.acqsig = 0;
-- ioctl(kbdFD, VT_SETMODE, &vtMode);
-+ // let us control VT switching
-+ vtMode.mode = VT_PROCESS;
-+ vtMode.relsig = VTSWITCHSIG;
-+ vtMode.acqsig = VTSWITCHSIG;
-+ ioctl(kbdFD, VT_SETMODE, &vtMode);
-
-- signal(VTSWITCHSIG, 0);
-- qDebug( "~QWSTtyKeyboardHandler() - released VT." );
--#endif
-+ struct vt_stat vtStat;
-+ ioctl(kbdFD, VT_GETSTATE, &vtStat);
-+ vtQws = vtStat.v_active;
-
--#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
-- ioctl(kbdFD, KDSKBMODE, K_XLATE);
--#endif
-- tcsetattr(kbdFD, TCSANOW, &origTermData);
-- ::close(kbdFD);
-- kbdFD = -1;
-- }
-+ signal(VTSWITCHSIG, vtSwitchHandler);
- }
-
--void QWSTtyKeyboardHandler::readKeyboardData()
-+QWSRamsesKbPrivate::~QWSRamsesKbPrivate()
- {
-- unsigned char buf[81];
-- int n = ::read(kbdFD, buf, 80 );
-- for ( int loop = 0; loop < n; loop++ )
-- doKey(buf[loop]);
--}
-+ signal(VTSWITCHSIG, 0);
-
--typedef struct {
-- unsigned short key;
-- unsigned short status;
--} SamsungKeypadInput;
-+ done_kbd();
-
--QWSSamsungKeypadHandler::QWSSamsungKeypadHandler(const QString& device)
--{
-- kbdFD=open(device.isEmpty() ? "/dev/keypad/0" : device.latin1(), O_RDONLY, 0);
-- if( kbdFD < 0 )
-- qWarning("could not open keypad device");
-+ struct vt_mode vtMode;
-+ ioctl(kbdFD, VT_GETMODE, &vtMode);
-+ /* Mickey says: "Better give up control of VT switching.
-+ * Hey, I really hate that OS-will-reacquire-resources on process-death
-+ * kind of thinking!
-+ */
-+ vtMode.mode = VT_AUTO;
-+ vtMode.relsig = 0;
-+ vtMode.acqsig = 0;
-+ ioctl(kbdFD, VT_SETMODE, &vtMode);
-
-- if ( kbdFD >= 0 ) {
-- QSocketNotifier *notifier;
-- notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL(activated(int)),this,
-- SLOT(readKeyboardData()) );
-- }
-+ ::close(kbdFD);
-+ kbdFD = -1;
- }
-
--QWSSamsungKeypadHandler::~QWSSamsungKeypadHandler()
--{
-- if (kbdFD >= 0)
-- {
-- ::close(kbdFD);
-- kbdFD = -1;
-- }
--}
-
--void QWSSamsungKeypadHandler::readKeyboardData()
-+static inline int map_to_modif(int current_map)
- {
-- SamsungKeypadInput input;
-- int n = ::read(kbdFD, &input, sizeof(SamsungKeypadInput) );
-- if( n < sizeof(SamsungKeypadInput) )
-- {
-- qWarning("Error reading input from keypad device.");
-- return;
-- }
-- unsigned short key = input.key;
-- unsigned short unicode = 0;
- int modifiers = 0;
-- QWSServer::KeyMap *km = (overrideMap ? overrideMap->find( input.key ) : 0);
-- if( km ) {
-- key = km->key_code;
-- unicode = km->unicode;
-- }
-- switch( key ) {
--#ifdef QT_KEYPAD_MODE
-- case Key_Menu:
-- case Key_Back:
-- case Key_Yes:
-- case Key_No:
-- case Key_Call:
-- case Key_Hangup:
-- case Key_Select:
-- case Key_Context1:
-- case Key_Context2:
-- case Key_Context3:
-- case Key_Context4:
-- modifiers |= Qt::Keypad;
-- break;
--#endif
-- }
-- processKeyEvent( unicode, key, modifiers, input.status != 0, FALSE );
--}
-
--/* USB driver */
-+ if (current_map & KG_ALT)
-+ modifiers |= Qt::ALT;
-+ else if (current_map & KG_CTRL)
-+ modifiers |= Qt::CTRL;
-+ else if (current_map & KG_SHIFT)
-+ modifiers |= Qt::SHIFT;
-
--QWSUsbKeyboardHandler::QWSUsbKeyboardHandler(const QString& device)
--{
-- lastPress = 0;
-- fd = ::open(device.isEmpty()?"/dev/input/event0":device.latin1(),O_RDONLY, 0);
-- if ( fd >= 0 ) {
-- QSocketNotifier *notifier;
-- notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL(activated(int)),this,
-- SLOT(readKeyboardData()) );
-- }
-+ return modifiers;
- }
-
--QWSUsbKeyboardHandler::~QWSUsbKeyboardHandler()
--{
-- ::close(fd);
--}
-+struct {
-+ const char *code;
-+ unsigned short qtcode;
-+} qtesc_lookup[] = {
-+ { "\e[A", Qt::Key_Up },
-+ { "\e[B", Qt::Key_Down },
-+ { "\e[C", Qt::Key_Right },
-+ { "\e[D", Qt::Key_Left },
-+ { "\e[1~", Qt::Key_Home },
-+ { "\e[4~", Qt::Key_End },
-+ { "\e[5~", Qt::Key_PageUp },
-+ { "\e[6~", Qt::Key_PageDown },
-
--struct Myinputevent {
-+ { "\e[[A", Qt::Key_F1 },
-+ { "\e[[B", Qt::Key_F2 },
-+ { "\e[[C", Qt::Key_F3 },
-+ { "\e[[D", Qt::Key_F4 },
-+ { "\e[[E", Qt::Key_F5 },
-+ { "\e[17~", Qt::Key_F6 },
-+ { "\e[18~", Qt::Key_F7 },
-+ { "\e[19~", Qt::Key_F8 },
-+ { "\e[20~", Qt::Key_F9 },
-+ { "\e[21~", Qt::Key_F10 },
-+ { "\e[23~", Qt::Key_F11 },
-+ { "\e[24~", Qt::Key_F12 },
-
-- unsigned int dummy1;
-- unsigned int dummy2;
-- unsigned short type;
-- unsigned short code;
-- unsigned int value;
-+ // { "\ex", Qt::FieldExit },
-+ // { "\er", Qt::FieldReset },
-
- };
-
--void QWSUsbKeyboardHandler::readKeyboardData()
--{
-- Myinputevent event;
-- int n = ::read(fd, &event, sizeof(Myinputevent) );
-- if ( n != 16 )
-- return;
--#ifdef QT_QWS_TIP2
-- // custom scan codes - translate them and create a key event immediately
-- if( overrideMap && event.value == 0 || overrideMap->find( event.value ) )
-- {
-- if( event.value )
-- {
-- int modifiers = 0;
-- QWSServer::KeyMap *km = overrideMap->find( event.value );
-- switch( km->unicode )
-- {
-- case Key_Menu:
-- case Key_Back:
-- case Key_Yes:
-- case Key_No:
-- case Key_Call:
-- case Key_Hangup:
-- case Key_Select:
-- case Key_Context1:
-- case Key_Context2:
-- case Key_Context3:
-- case Key_Context4:
-- {
-- modifiers |= Keypad;
-- break;
-- }
-- default:
-- break;
-- }
-- if( km->key_code == Key_F10 && QCopChannel::isRegistered( "QPE/System" ) ) {
-- //hardcoded for now
-- QCopChannel::send( "QPE/System", "showHomeScreen()" );
-- } else {
-- processKeyEvent( km->unicode, km->key_code, modifiers,
-- TRUE, FALSE );
-- }
-- lastPress = km;
-- }
-- else if( lastPress )
-- {
-- processKeyEvent( lastPress->unicode, lastPress->key_code, 0,
-- FALSE, FALSE );
-- lastPress = 0;
-- }
-- }
-- else
--#endif
-- {
-- int key=event.code;
-- if(key==103) {
-- processKeyEvent( 0, Qt::Key_Up, 0, event.value!=0, false );
-- } else if(key==106) {
-- processKeyEvent( 0, Qt::Key_Right, 0, event.value!=0, false );
-- } else if(key==108) {
-- processKeyEvent( 0, Qt::Key_Down, 0, event.value!=0, false );
-- } else if(key==105) {
-- processKeyEvent( 0, Qt::Key_Left, 0, event.value!=0, false );
-- } else {
-- if(event.value==0) {
-- key=key | 0x80;
-- }
-- doKey(key);
-- }
-- }
--}
--
--/*
-- * YOPY buttons driver
-- * Contributed by Ron Victorelli (victorrj at icubed.com)
-- */
-+struct {
-+ unsigned char code;
-+ unsigned short qtcode;
-+} qtkey_lookup[] = {
-+ { 0x08, Qt::Key_Backspace },
-+ { 0x09, Qt::Key_Tab },
-+ { 0x0d, Qt::Key_Enter },
-+ { 0x1b, Qt::Key_Escape },
-+};
-
--QWSyopyButtonsHandler::QWSyopyButtonsHandler() : QWSKeyboardHandler()
-+void QWSRamsesKbPrivate::handleKey(unsigned char code, int n)
- {
--#ifdef QT_QWS_YOPY
-- terminalName = "/dev/tty1";
-- buttonFD = -1;
-- notifier = 0;
--
-- if ((buttonFD = ::open(terminalName, O_RDWR | O_NDELAY, 0)) < 0) {
-- qFatal("Cannot open %s\n", terminalName.latin1());
-- } else {
-+ int qtKeyCode = Qt::Key_unknown;
-+ unsigned int i;
-
-- tcsetpgrp(buttonFD, getpgid(0));
-+ //qDebug("\nhandleKey %02x %d %c", code, n, code >= ' ' ? code : ' ');
-
-- /* put tty into "straight through" mode.
-- */
-- if (tcgetattr(buttonFD, &oldT) < 0) {
-- qFatal("Linux-kbd: tcgetattr failed");
-- }
-+ // Single keys
-+ if ((n==1) && (rptr==0)) {
-+ qtKeyCode = code;
-+ for (i=0; i < sizeof(qtkey_lookup)/sizeof(qtkey_lookup[0]); i++) {
-+ if (qtkey_lookup[i].code == code) {
-+ qtKeyCode = qtkey_lookup[i].qtcode;
-+ code = 0;
-+ break;
-+ }
-+ }
-+ } else
-
-- newT = oldT;
-- newT.c_lflag &= ~(ICANON | ECHO | ISIG);
-- newT.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
-- newT.c_iflag |= IGNBRK;
-- newT.c_cc[VMIN] = 0;
-- newT.c_cc[VTIME] = 0;
-+ // Alt-<KEY> sequence
-+ if ((n==1) && (rptr==1) && (rbuf[0] == '\e')) {
-+ //qDebug("alt-key %d", code);
-+ handler->processKeyEvent(0, Qt::Key_Alt, 0, 1, 0);
-+ handler->processKeyEvent(0, code-32, Qt::ALT, 1, 0);
-+ handler->processKeyEvent(0, code-32, Qt::ALT, 0, 0);
-+ handler->processKeyEvent(0, Qt::Key_Alt, 0, 0, 0);
-+ rptr = 0;
-+ return;
-+ } else
-
-+ // End of a function key sequence
-+ if ((n==1) && (rptr!=0)) {
-+ rbuf[rptr++] = code;
-+ rbuf[rptr] = 0;
-+ for (i=0; i < sizeof(qtesc_lookup)/sizeof(qtesc_lookup[0]); i++) {
-+ if (strncmp(rbuf, qtesc_lookup[i].code, sizeof(rbuf)) == 0) {
-+ qtKeyCode = qtesc_lookup[i].qtcode;
-+ code = 0;
-+ break;
-+ }
-+ }
-+ if (code != 0) {
-+ //qWarning("no entry in key sequence table for %s", &rbuf[1]);
-+ int oldrptr = rptr;
-+ rptr = 0;
-+ for (i=0; i <= oldrptr; i++) {
-+ handleKey(rbuf[i], 1);
-+ }
-+ return;
-+ }
-+ rptr = 0;
-+ } else
-
-- if (tcsetattr(buttonFD, TCSANOW, &newT) < 0) {
-- qFatal("Linux-kbd: TCSANOW tcsetattr failed");
-- }
-+ // Middle of a function key sequence
-+ {
-+ if (rptr < sizeof(rbuf))
-+ rbuf[rptr++] = code;
-+ return;
-+ }
-
-- if (ioctl(buttonFD, KDSKBMODE, K_MEDIUMRAW) < 0) {
-- qFatal("Linux-kbd: KDSKBMODE tcsetattr failed");
-- }
-+ //qDebug(" code 0x%2x %d -> qtKeyCode 0x%04x", code, code, qtKeyCode);
-
-- notifier = new QSocketNotifier( buttonFD, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL(activated(int)),this,
-- SLOT(readKeyboardData()) );
-- }
--#endif
-+ handler->processKeyEvent(code, qtKeyCode, 0, 1, 0);
-+ handler->processKeyEvent(code, qtKeyCode, 0, 0, 0);
- }
-
--QWSyopyButtonsHandler::~QWSyopyButtonsHandler()
--{
--#ifdef QT_QWS_YOPY
-- if ( buttonFD > 0 ) {
-- ::close( buttonFD );
-- buttonFD = -1;
-- }
--#endif
--}
-
--void QWSyopyButtonsHandler::readKeyboardData()
-+void QWSRamsesKbPrivate::readKeyboardData()
- {
--#ifdef QT_QWS_YOPY
-- uchar buf[1];
-- char c='1';
-- int fd;
--
-- int n = ::read(buttonFD,buf,1);
-- if (n<0) {
-- qDebug("Keyboard read error %s",strerror(errno));
-- } else {
-- uint code = buf[0]&YPBUTTON_CODE_MASK;
-- bool press = !(buf[0]&0x80);
-- // printf("Key=%d/%d/%d\n",buf[1],code,press);
-- int k=(-1);
-- switch(code) {
-- case 39: k=Qt::Key_Up; break;
-- case 44: k=Qt::Key_Down; break;
-- case 41: k=Qt::Key_Left; break;
-- case 42: k=Qt::Key_Right; break;
-- case 56: k=Qt::Key_F1; break; //windows
-- case 29: k=Qt::Key_F2; break; //cycle
-- case 24: k=Qt::Key_F3; break; //record
-- case 23: k=Qt::Key_F4; break; //mp3
-- case 4: k=Qt::Key_F5; break; // PIMS
-- case 1: k=Qt::Key_Escape; break; // Escape
-- case 40: k=Qt::Key_Up; break; // prev
-- case 45: k=Qt::Key_Down; break; // next
-- case 35: if( !press ) {
-- fd = ::open("/proc/sys/pm/sleep",O_RDWR,0);
-- if( fd >= 0 ) {
-- ::write(fd,&c,sizeof(c));
-- ::close(fd);
-- //
-- // Updates all widgets.
-- //
-- QWidgetList *list = QApplication::allWidgets();
-- QWidgetListIt it( *list ); // iterate over the widgets
-- QWidget * w;
-- while ( (w=it.current()) != 0 ) { // for each widget...
-- ++it;
-- w->update();
-- }
-- delete list;
-- // qApp->desktop()->repaint();
-- }
-- }
-- break;
--
-- default: k=(-1); break;
-- }
--
-- if ( k >= 0 ) {
-- qwsServer->processKeyEvent( 0, k, 0, press, false );
-- }
-+ unsigned char buf[81];
-+ int n = read(kbdFD, buf, 80 );
-+ for ( int loop = 0; loop < n; loop++ ) {
-+ handleKey(buf[loop], n-loop);
- }
--#endif
- }
-
-
--/*
-- * vr41xx buttons driver
-- */
--
--QWSVr41xxButtonsHandler::QWSVr41xxButtonsHandler() : QWSKeyboardHandler()
--{
--#ifdef QT_QWS_CASSIOPEIA
-- terminalName = "/dev/buttons";
-- buttonFD = -1;
-- notifier = 0;
-
-- if ((buttonFD = ::open(terminalName, O_RDWR | O_NDELAY, 0)) < 0)
-- {
-- qWarning("Cannot open %s\n", terminalName.latin1());
-- }
--
-- if ( buttonFD >= 0 ) {
-- notifier = new QSocketNotifier( buttonFD, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL(activated(int)),this,
-- SLOT(readKeyboardData()) );
-- }
-
-- kbdBufferLen = 80;
-- kbdBuffer = new unsigned char [kbdBufferLen];
-- kbdIdx = 0;
--#endif
--}
-
--QWSVr41xxButtonsHandler::~QWSVr41xxButtonsHandler()
-+QWSRamsesKeyboardHandler::QWSRamsesKeyboardHandler( const QString &device )
- {
--#ifdef QT_QWS_CASSIOPEIA
-- if ( buttonFD > 0 ) {
-- ::close( buttonFD );
-- buttonFD = -1;
-- }
-- delete notifier;
-- notifier = 0;
-- delete [] kbdBuffer;
--#endif
-+ d = new QWSRamsesKbPrivate( this, device );
- }
-
--void QWSVr41xxButtonsHandler::readKeyboardData()
-+QWSRamsesKeyboardHandler::~QWSRamsesKeyboardHandler()
- {
--#ifdef QT_QWS_CASSIOPEIA
-- int n = 0;
-- do {
-- n = ::read(buttonFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx );
-- if ( n > 0 )
-- kbdIdx += n;
-- } while ( n > 0 );
--
-- int idx = 0;
-- while ( kbdIdx - idx >= 2 ) {
-- unsigned char *next = kbdBuffer + idx;
-- unsigned short *code = (unsigned short *)next;
-- int keycode = Qt::Key_unknown;
-- switch ( (*code) & 0x0fff ) {
-- case 0x7:
-- keycode = Qt::Key_Up;
-- break;
-- case 0x9:
-- keycode = Qt::Key_Right;
-- break;
-- case 0x8:
-- keycode = Qt::Key_Down;
-- break;
-- case 0xa:
-- keycode = Qt::Key_Left;
-- break;
-- case 0x3:
-- keycode = Qt::Key_Up;
-- break;
-- case 0x4:
-- keycode = Qt::Key_Down;
-- break;
-- case 0x1:
-- keycode = Qt::Key_Return;
-- break;
-- case 0x2:
-- keycode = Qt::Key_F4;
-- break;
-- default:
-- qDebug("Unrecognised key sequence %d", (int)code );
-- }
-- if ( (*code) & 0x8000 )
-- processKeyEvent( 0, keycode, 0, FALSE, FALSE );
-- else
-- processKeyEvent( 0, keycode, 0, TRUE, FALSE );
--/*
-- unsigned short t = *code;
-- for ( int i = 0; i < 16; i++ ) {
-- keycode = (t & 0x8000) ? Qt::Key_1 : Qt::Key_0;
-- int unicode = (t & 0x8000) ? '1' : '0';
-- processKeyEvent( unicode, keycode, 0, TRUE, FALSE );
-- processKeyEvent( unicode, keycode, 0, FALSE, FALSE );
-- t <<= 1;
-- }
-- keycode = Qt::Key_Space;
--// processKeyEvent( ' ', keycode, 0, TRUE, FALSE );
--// processKeyEvent( ' ', keycode, 0, FALSE, FALSE );
--*/
-- idx += 2;
-- }
--
-- int surplus = kbdIdx - idx;
-- for ( int i = 0; i < surplus; i++ )
-- kbdBuffer[i] = kbdBuffer[idx+i];
-- kbdIdx = surplus;
--#endif
-+ delete d;
- }
-
--
--/*
-- * Virtual framebuffer keyboard driver
-- */
--
--#ifndef QT_NO_QWS_VFB
--#include "qvfbhdr.h"
--extern int qws_display_id;
--#endif
--
--QWSVFbKeyboardHandler::QWSVFbKeyboardHandler()
-+void QWSRamsesKeyboardHandler::processKeyEvent(int unicode, int keycode,
-+ int modifiers, bool isPress, bool autoRepeat)
- {
-- kbdFD = -1;
--#ifndef QT_NO_QWS_VFB
-- kbdIdx = 0;
-- kbdBufferLen = sizeof( QVFbKeyData ) * 5;
-- kbdBuffer = new unsigned char [kbdBufferLen];
--
-- terminalName = QString(QT_VFB_KEYBOARD_PIPE).arg(qws_display_id);
--
-- if ((kbdFD = ::open(terminalName.local8Bit().data(), O_RDWR | O_NDELAY)) < 0) {
-- qDebug( "Cannot open %s (%s)", terminalName.latin1(),
-- strerror(errno));
-- } else {
-- // Clear pending input
-- char buf[2];
-- while (::read(kbdFD, buf, 1) > 0) { }
--
-- notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this );
-- connect(notifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()));
-+ // Virtual console switching
-+ int term = 0;
-+ bool ctrl = modifiers & Qt::ControlButton;
-+ bool alt = modifiers & Qt::AltButton;
-+ if (ctrl && alt && keycode >= Qt::Key_F1 && keycode <= Qt::Key_F10)
-+ term = keycode - Qt::Key_F1 + 1;
-+ else if (ctrl && alt && keycode == Qt::Key_Left)
-+ term = QMAX(vtQws - 1, 1);
-+ else if (ctrl && alt && keycode == Qt::Key_Right)
-+ term = QMIN(vtQws + 1, 10);
-+ if (term && !isPress) {
-+ ioctl(kbdFD, VT_ACTIVATE, term);
-+ return;
- }
--#endif
--}
-
--QWSVFbKeyboardHandler::~QWSVFbKeyboardHandler()
--{
--#ifndef QT_NO_QWS_VFB
-- if ( kbdFD >= 0 )
-- ::close( kbdFD );
-- delete [] kbdBuffer;
--#endif
-+ QWSKeyboardHandler::processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat );
- }
-
-
--void QWSVFbKeyboardHandler::readKeyboardData()
--{
--#ifndef QT_NO_QWS_VFB
-- int n;
-- do {
-- n = ::read(kbdFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx );
-- if ( n > 0 )
-- kbdIdx += n;
-- } while ( n > 0 );
--
-- int idx = 0;
-- while ( kbdIdx - idx >= (int)sizeof( QVFbKeyData ) ) {
-- QVFbKeyData *kd = (QVFbKeyData *)(kbdBuffer + idx);
-- if ( kd->unicode == 0 && kd->modifiers == 0 && kd->press ) {
-- // magic exit key
-- qWarning( "Instructed to quit by Virtual Keyboard" );
-- qApp->quit();
-- }
--#ifdef QT_KEYPAD_MODE
-- QWSServer::KeyMap *currentKey = overrideMap ? overrideMap->find( (kd->unicode >> 16) ) : 0;
-- if ( currentKey )
-- processKeyEvent( currentKey->unicode, currentKey->key_code,
-- kd->modifiers, kd->press, kd->repeat );
-- else
--#endif
-- processKeyEvent( kd->unicode&0xffff, kd->unicode>>16,
-- kd->modifiers, kd->press, kd->repeat );
--
-- idx += sizeof( QVFbKeyData );
-- }
--
-- int surplus = kbdIdx - idx;
-- for ( int i = 0; i < surplus; i++ )
-- kbdBuffer[i] = kbdBuffer[idx+i];
-- kbdIdx = surplus;
--#endif
--}
--
-
- /*
- * keyboard driver instantiation
-@@ -1836,26 +565,12 @@
- } else {
- type = spec;
- }
-- if ( type == "Buttons" ) {
--#if defined(QT_QWS_SIMPAD)
-- qDebug( "QWSKeyboardHandler: using SIMpad switches handler..." );
-- handler = new QWSsimpadButtonsHandler();
--#elif defined(QT_QWS_YOPY)
-- handler = new QWSyopyButtonsHandler();
--#elif defined(QT_QWS_CASSIOPEIA)
-- handler = new QWSVr41xxButtonsHandler();
--#endif
-- } else if ( type == "QVFbKeyboard" ) {
-+
-+ if ( type == "QVFbKeyboard" ) {
- handler = new QWSVFbKeyboardHandler();
-- } else if ( type == "USB" ) {
-- handler = new QWSUsbKeyboardHandler(device);
- } else if ( type == "TTY" ) {
-- handler = new QWSTtyKeyboardHandler(device);
-- }
-- else if( type == "Samsung" ) {
-- handler = new QWSSamsungKeypadHandler(device);
-- }
-- else {
-+ handler = new QWSRamsesKeyboardHandler(device);
-+ } else {
- qWarning( "Keyboard type %s:%s unsupported", spec.latin1(), device.latin1() );
- }
-
-@@ -1864,231 +579,6 @@
-
- #include "qkeyboard_qws.moc"
-
--#endif // QNX6
--
--/*!
-- \internal
-- Returns the map of scancodes to Qt key codes and text
--*/
--const QWSServer::KeyMap *QWSServer::keyMap()
--{
-- return keyM;
--}
--
--
--/*
-- * SIMpad switches handler
-- * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-- */
--
--
--QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
-- :QWSKeyboardHandler(), fd( -1 ),
-- repeatdelay( 700 ), repeatperiod( 80 ),
-- lastCode( 0 ), lastPress( 0 ),
-- k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false )
--{
-- qDebug( "SimpadButtonsHandler() - V4.1" );
-- fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 );
-- if ( fd < 0 )
-- {
-- qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE );
-- return;
-- }
--
-- notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
-- connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
--
-- repeater = new QTimer(this);
-- connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat()));
--
--}
--
--
--QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler()
--{
-- qDebug( "~SimpadButtonsHandler()" );
-- if ( fd > 0 )
-- {
-- ::close( fd );
-- fd = -1;
-- }
--}
--
--
--void QWSsimpadButtonsHandler::readSwitchesData()
--{
-- qDebug( "SimpadButtonsHandler() - detected switches action" );
--
-- if ( ::read( fd, &switches, sizeof switches ) < 0 )
-- {
-- qWarning( "SimpadButtonsHandler() - switches read error!" );
-- return;
-- }
--
-- qDebug( "SimpadButtonsHandler() - Shift: %0x [used: %0x] + Event = %0x | %0x",
-- shiftKeyPressed, shiftUsed, switches.events[0], switches.states[0] );
--
-- bool press = switches.states[0]; // == switches.event[0];
-- int code = switches.events[0];
--
-- //=========================================================================
--
-- /**
-- * Work around a bug in the kernel keyboard driver emitting
-- * bogus events when pressing multiple switches at once
-- **/
--
-- if ( lastCode == 0 )
-- {
-- // first press ever
-- eventTimer.start();
-- lastPress = press;
-- lastCode = code;
-- }
-- else
-- {
-- int interval = eventTimer.restart();
-- qDebug( "event interval = %d", interval );
-- if ( code == lastCode && interval < 10 )
-- {
-- qDebug( "event interval too small - ignoring bogus event" );
-- qDebug( "did I say i hate buggy kernel drivers? :-D" );
-- return;
-- }
--
-- lastPress = press;
-- lastCode = code;
-- }
--
-- /**
-- * Actually it may also be a hardware problem, but I really don't like
-- * to review kernel code for further inquiry. So just being lazy and
-- * do the workaround in user space :-D
-- **/
--
-- //=====================================================================
--
-- if ( shiftKeyPressed )
-- {
-- // a shift key obviously is being held
-- qDebug( "while shift key is being held..." );
--
-- if ( code != shiftKeyPressed )
-- {
-- // another key is being touched - that means shift mode for us!
-- qDebug( " another key is being touched -> shift use now = true" );
--
-- shiftUsed = true;
--
-- if ( shiftKeyPressed == SIMPAD_SWITCH_LOWER ) // SHIFT 1
-- {
-- qDebug( " shift mode 1" );
-- switch(code)
-- {
-- case SIMPAD_SWITCH_UP: k = Qt::Key_F9; break; // Shift1-Up = Calendar
-- case SIMPAD_SWITCH_DOWN: k = Qt::Key_F10; break; // Shift1-Down = Contacts
-- case SIMPAD_SWITCH_LEFT: k = Qt::Key_F13; break; // Shift1-Left = Mail
-- case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F11; break; // Shift1-Up = Menu
-- case SIMPAD_SWITCH_UPPER: k = Qt::Key_F12; break; // Shift1-Upper = Home
-- default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 1 !" ); break;
-- }
-- }
-- else if ( shiftKeyPressed == SIMPAD_SWITCH_UPPER ) // SHIFT 2
-- {
-- qDebug( " shift mode 2" );
-- switch(code)
-- {
-- case SIMPAD_SWITCH_UP: k = Qt::Key_F5; break; // Shift2-Up = F5
-- case SIMPAD_SWITCH_DOWN: k = Qt::Key_F6; break; // Shift2-Down = F6
-- case SIMPAD_SWITCH_LEFT: k = Qt::Key_F7; break; // Shift2-Left = F7
-- case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F8; break; // Shift2-Up = F8
-- case SIMPAD_SWITCH_LOWER: k = Qt::Key_F9; break; // Shift2-Lower = F9
-- default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 2!" ); break;
-- }
-- }
-- }
-- else
-- {
-- qDebug( " shift key has been released. checking if being used..." );
-- shiftKeyPressed = 0;
--
-- if ( !shiftUsed )
-- {
-- qDebug( " ... has _not_ being used -> really emit the key" );
-- k = ( code == SIMPAD_SWITCH_UPPER ? Qt::Key_Escape : Qt::Key_Return );
-- qDebug( "Emitting key = %d (pressed)", k );
-- processKeyEvent( 0, k, 0, true, true );
-- qDebug( "Emitting key = %d (released)", k );
-- processKeyEvent( 0, k, 0, false, true );
-- return;
-- }
-- else
-- {
-- qDebug( " ... has being used -> doing nothing" );
-- return;
-- }
-- }
-- }
-- else
-- {
-- qDebug( "standard mode - no shift yet..." );
--
-- switch(code)
-- {
-- case SIMPAD_SWITCH_UP: k = Qt::Key_Up; break;
-- case SIMPAD_SWITCH_DOWN: k = Qt::Key_Down; break;
-- case SIMPAD_SWITCH_LEFT: k = Qt::Key_Left; break;
-- case SIMPAD_SWITCH_RIGHT: k = Qt::Key_Right; break;
-- case SIMPAD_SWITCH_POWER: k = Qt::Key_F34; break; // Power Button
--
-- case SIMPAD_SWITCH_UPPER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
-- case SIMPAD_SWITCH_LOWER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
--
-- default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break;
-- }
-- }
--
-- if ( k == -1 )
-- {
-- qDebug( "no key to emit - returning." );
-- return;
-- }
--
-- bool repeatable = ( k == Qt::Key_Up || k == Qt::Key_Down ||
-- k == Qt::Key_Right || k == Qt::Key_Left );
--
-- qDebug( "key to emit = %d [%s] [repeat=%s]", k,
-- press ? "press" : "release",
-- repeatable ? "true":"false" );
--
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-- if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
-- {
-- qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." );
-- int oldK = k;
-- k = xform_dirkey( k );
-- qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k );
-- }
--#endif
--
-- if ( repeatable && press )
-- repeater->start( repeatdelay, true );
-- else
-- repeater->stop();
--
-- qwsServer->processKeyEvent( 0, k, 0, press, false );
--}
--
--
--void QWSsimpadButtonsHandler::autoRepeat()
--{
-- qDebug( "Emitting key = %d (released)", k );
-- processKeyEvent( 0, k, 0, false, true );
-- qDebug( "Emitting key = %d (pressed)", k );
-- processKeyEvent( 0, k, 0, true, true );
-- repeater->start(repeatperiod);
--}
-+#endif // QT_NO_QWS_KEYBOARD
-
-
--#endif // QT_NO_QWS_KEYBOARD
---- qt-2.3.10/src/kernel/qwindowsystem_qws.cpp~ramses-keyboard
-+++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
-@@ -1791,6 +1791,7 @@
- }
-
- #ifndef QT_NO_QWS_KEYBOARD
-+#ifndef QT_QWS_RAMSES
- static int keyUnicode(int keycode)
- {
- const QWSServer::KeyMap *km = QWSServer::keyMap();
-@@ -1803,6 +1804,7 @@
- return 0xffff;
- }
- #endif
-+#endif
- /*!
- Send a key event. You can use this to send key events generated by
- "virtual keyboards".
-@@ -1845,8 +1847,10 @@
-
- event.simpleData.unicode =
- #ifndef QT_NO_QWS_KEYBOARD
-+#ifndef QT_QWS_RAMSES
- unicode < 0 ? keyUnicode(keycode) :
- #endif
-+#endif
- unicode;
- event.simpleData.keycode = keycode;
- event.simpleData.modifiers = modifiers;
diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.cpp
diff --git a/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/ramses/qkeyboard_qws.h
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 4c9d573f87..3acac40d15 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r7"
+PR = "r8"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
file://qpe.patch;patch=1 \
@@ -36,10 +36,11 @@ SRC_URI_append_jornada720 = "file://kernel-keymap.patch;patch=1 "
SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 "
SRC_URI_append_ramses = "file://devfs.patch;patch=1 \
file://ramses.patch;patch=1 \
- file://ramses-keyboard.patch;patch=1 \
- file://ramses-touchscreen.patch;patch=1 "
-SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 "
-SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 "
+ file://ramses-touchscreen.patch;patch=1 \
+ file://qkeyboard_qws.h \
+ file://qkeyboard_qws.cpp "
+SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
S = "${WORKDIR}/qt-${PV}"
@@ -94,6 +95,12 @@ export SYSCONF_LFLAGS_ramses = "${LDFLAGS}"
export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
+do_configure_prepend_ramses() {
+ chmod -R a+w ${S}/src/kernel
+ cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
+ cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
+}
+
do_configure() {
for f in ${S}/configs/linux-*-g++-shared; do
sed -e 's,-linux-,-linux-uclibc-,g' < $f \
diff --git a/packages/spca5xx/spca5xx_20050319.bb b/packages/spca5xx/spca5xx_20050319.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/spca5xx/spca5xx_20050319.bb
diff --git a/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch b/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch
diff --git a/packages/sysfsutils/sysfsutils_1.2.0.bb b/packages/sysfsutils/sysfsutils_1.2.0.bb
index 50114fabec..8c70551404 100644
--- a/packages/sysfsutils/sysfsutils_1.2.0.bb
+++ b/packages/sysfsutils/sysfsutils_1.2.0.bb
@@ -1,9 +1,11 @@
SECTION = "base"
DESCRIPTION = "System Utilities Based on Sysfs"
HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
-S = "${WORKDIR}/sysfsutils-${PV}"
LICENSE = "GPLv2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
+ file://libsysfs-write-attribute.patch;patch=1"
+S = "${WORKDIR}/sysfsutils-${PV}"
+PR = "r1"
inherit autotools
diff --git a/packages/ttyconv/ttyconv_0.2.3.bb b/packages/ttyconv/ttyconv_0.2.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ttyconv/ttyconv_0.2.3.bb
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index 910f4b19dd..f433803b89 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -74,8 +74,8 @@ EXTRA_OECONF = "--disable-plugins \
do_install() {
autotools_do_install
- install -d ${D}/${datadir}/applications
- install -m 644 ipkg/vlc.gpe ${D}/${datadir}/applications/vlc-gpe.desktop
+ install -d ${D}${datadir}/applications
+ install -m 644 ipkg/vlc.gpe ${D}${datadir}/applications/vlc-gpe.desktop
}
FILES_${PN} = "${bindir}/vlc \
diff --git a/packages/w3cam/files/staticpaths.patch b/packages/w3cam/files/staticpaths.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/w3cam/files/staticpaths.patch
diff --git a/packages/w3cam/w3cam_0.7.2.bb b/packages/w3cam/w3cam_0.7.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/w3cam/w3cam_0.7.2.bb
diff --git a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index e69de29bb2..a35136bb40 100644
--- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -0,0 +1,9 @@
+LICENSE = GPL
+DESCRIPTION = "Transparent xcursor theme for handheld systems"
+SECTION = "x11/base"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+ file://use-relative-symlinks.patch;patch=1"
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+
+inherit autotools
diff --git a/packages/zaurus-updater/spitz/updater.sh.c3000 b/packages/zaurus-updater/spitz/updater.sh.c3000
index e69de29bb2..9ad81e36cd 100644
--- a/packages/zaurus-updater/spitz/updater.sh.c3000
+++ b/packages/zaurus-updater/spitz/updater.sh.c3000
@@ -0,0 +1,323 @@
+#!/bin/sh
+
+
+DATAPATH=$1
+TMPPATH=/tmp/update
+TMPDATA=$TMPPATH/tmpdata.bin
+TMPHEAD=$TMPPATH/tmphead.bin
+
+WFLG_KERNEL=0
+WFLG_INITRD=0
+WFLG_MVERSION=0
+WFLG_HDD=0
+
+RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1`
+if [ "$RO_MTD_LINE" = "" ]; then
+ RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
+fi
+RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2`
+RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2`
+RO_MTD=/dev/mtd$RO_MTD_NO
+RO_MTDBLK=/dev/mtdblock$RO_MTD_NO
+RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /`
+
+RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1`
+if [ "$RW_MTD_LINE" = "" ]; then
+ RW_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1`
+fi
+RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2`
+RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2`
+RW_MTD=/dev/mtd$RW_MTD_NO
+RW_MTDBLK=/dev/mtdblock$RW_MTD_NO
+RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /`
+
+LOGOCAL_MTD=/dev/mtd1
+
+VERBLOCK=0x48000
+MVRBLOCK=0x70000
+
+RESULT=0
+
+Cleanup(){
+ rm -f $VTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ rm $CTRLPATH/* > /dev/null 2>&1
+ rm $DATAPATH/* > /dev/null 2>&1
+ exit $1
+}
+trap 'Cleanup 1' 1 15
+trap '' 2 3
+
+get_dev_pcmcia()
+{
+while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR;
+do
+ echo $DEVS
+done
+}
+get_dev_pcmcia_slot()
+{
+ grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia
+}
+sleep 1
+IDE1=`get_dev_pcmcia_slot 1`
+if [ "$IDE1" = "" ]; then
+ echo "Error!! There is no HDD. Now retrying..."
+ while [ "$IDE1" = "" ]; do
+ IDE1=`get_dev_pcmcia_slot 1`
+ done
+ echo "Found HDD!!"
+fi
+
+#LINUXFMT=ext2
+LINUXFMT=ext3
+MKE2FSOPT=
+if [ "$LINUXFMT" = "ext3" ]; then
+ MKE2FSOPT=-j
+fi
+
+
+### Check model ###
+/sbin/writerominfo
+MODEL=`cat /proc/deviceinfo/product`
+if [ "$MODEL" != "SL-C3000" ]
+then
+ echo 'MODEL:'$MODEL
+ echo 'ERROR:Invalid model!'
+ echo 'Please reset'
+ while true
+ do
+ done
+fi
+
+mkdir -p $TMPPATH > /dev/null 2>&1
+
+cd $DATAPATH/
+
+for TARGETFILE in zImage.bin zimage.bin ZIMAGE.BIN initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
+do
+ if [ -e $TARGETFILE ]
+ then
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
+ DATASIZE=`wc -c $TARGETFILE`
+ DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
+
+ #echo $TARGETFILE':'$DATASIZE'bytes'
+ TARGETTYPE=Invalid
+ case "$TARGETFILE" in
+ zImage.bin) TARGETTYPE=Kernel;;
+ zimage.bin) TARGETTYPE=Kernel;;
+ ZIMAGE.BIN) TARGETTYPE=Kernel;;
+ initrd.bin) TARGETTYPE=RoFs;;
+ INITRD.BIN) TARGETTYPE=RoFs;;
+ mversion.bin) TARGETTYPE=MasterVer;;
+ MVERSION.BIN) TARGETTYPE=MasterVer;;
+ *)
+ continue
+ ;;
+ esac
+
+ case "$TARGETTYPE" in
+ Kernel)
+ if [ $WFLG_KERNEL != 0 ]
+ then
+ continue
+ fi
+ WFLG_KERNEL=1
+ echo 'kernel'
+ ISLOGICAL=1
+ MODULEID=5
+ MODULESIZE=0x13C000
+ ADDR=`dc 0xE0000`
+ ISFORMATTED=1
+ DATAPOS=0
+ ONESIZE=524288
+ HDTOP=`expr $DATASIZE - 16`
+ /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
+ ;;
+ RoFs)
+ if [ $WFLG_INITRD != 0 ]
+ then
+ continue
+ fi
+ WFLG_INITRD=1
+ echo 'RO file system'
+ ISLOGICAL=0
+ MODULEID=6
+ MODULESIZE=0x500000
+ ADDR=0
+ ISFORMATTED=0
+ TARGET_MTD=$RO_MTD
+ DATAPOS=16
+ ONESIZE=1048576
+ /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
+ ;;
+ MasterVer)
+ if [ $WFLG_MVERSION != 0 ]
+ then
+ continue
+ fi
+ WFLG_MVERSION=1
+ echo 'Master version'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TARGETFILE 0 0 > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ echo 'Success!'
+ continue
+ ;;
+ *)
+ continue
+ ;;
+ esac
+
+
+ #format?
+ if [ $ISFORMATTED = 0 ]
+ then
+ echo -n 'Flash erasing...'
+ /sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null
+ #/sbin/eraseall $TARGET_MTD 2
+ echo 'done'
+ ISFORMATTED=1
+ fi
+
+ echo ''
+ echo '0% 100%'
+ PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+ PROGSTEP=`expr 28 / $PROGSTEP`
+ if [ $PROGSTEP = 0 ]
+ then
+ PROGSTEP=1
+ fi
+
+ #00 means header information
+ VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+
+ #echo 'found header'
+ /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1
+
+ #loop
+ while [ $DATAPOS -lt $DATASIZE ]
+ do
+ #data create
+ bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+ TMPSIZE=`wc -c $TMPDATA`
+ TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+ DATAPOS=`expr $DATAPOS + $TMPSIZE`
+
+ #handle data file
+ #echo 'ADDR='$ADDR
+ #echo 'SIZE='$TMPSIZE
+ if [ $ISLOGICAL = 0 ]
+ then
+ next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+ if [ "$next_addr" = "" ]; then
+ echo "ERROR:flash write"
+ rm $TMPDATA > /dev/null 2>&1
+ RESULT=3
+ break;
+ fi
+ ADDR=$next_addr
+ else
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+ ADDR=`expr $ADDR + $TMPSIZE`
+ fi
+
+ rm $TMPDATA > /dev/null 2>&1
+
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
+ done
+
+ echo ''
+
+#finish
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
+
+ if [ $RESULT = 0 ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+
+ rm -f $VTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ echo 'Success!'
+ else
+ echo 'Error!'
+ exit $RESULT
+ fi
+ fi
+done
+
+HDD1FILE=hdimage1.tgz
+## HDD image
+for TARGETFILE in hdimage1.tgz HDIMAGE1.TGZ
+do
+ if [ -e $TARGETFILE ]; then
+ if [ $WFLG_HDD != 0 ]
+ then
+ continue
+ fi
+ WFLG_HDD=1
+ echo ''
+ echo 'HDD RO file system'
+ if [ ! -f /hdd1/NotAvailable ]; then
+ umount /hdd1
+ fi
+ echo 'Now formatting...'
+ mke2fs $MKE2FSOPT /dev/${IDE1}1 2> /dev/null > /dev/null
+ e2fsck -p /dev/${IDE1}1 > /dev/null
+ if [ "$?" != "0" ]; then
+ echo "Error!"
+ exit "$?"
+ fi
+
+ mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
+ if [ "$?" != "0" ]; then
+ echo "Error!"
+ exit "$?"
+ fi
+
+ cd /
+ echo 'Now extracting...'
+ gzip -dc $DATAPATH/$HDD1FILE | tar xf -
+ if [ "$?" != "0" ]; then
+ echo "Error!"
+ exit "$?"
+ fi
+
+ # delete java if no java model
+ if [ ! -f /root/.java ]; then
+ rm -rf /hdd1/usr/QtPalmtop.rom/j2me
+ fi
+
+ ## write check sum
+ ORGFILE=$DATAPATH/mversion.bin
+ if [ ! -f $ORGFILE ]; then
+ ORGFILE=$DATAPATH/MVERSION.BIN
+ fi
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ /sbin/verchg_hdd $MTMPNAME $ORGFILE 9 > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+
+ echo 'Success!'
+ # remount as RO
+ umount /hdd1
+ mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1
+ fi
+done
+
+exit 0
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index e69de29bb2..5e170f1cb0 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
+DEPENDS = "encdec-updater-native"
+LICENSE = "zaurus-updater"
+PR = "r1"
+
+SRC_URI = "file://updater.sh"
+S = "${WORKDIR}"
+
+do_compile() {
+ encdec-updater -e updater.sh
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR}/images/
+ install -m 0755 updater.sh ${DEPLOY_DIR}/images/updater.sh.${MACHINE}
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/zeecookbook/files/zeecookbook.patch b/packages/zeecookbook/files/zeecookbook.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zeecookbook/files/zeecookbook.patch
diff --git a/packages/zeecookbook/zeecookbook_1.0beta3.bb b/packages/zeecookbook/zeecookbook_1.0beta3.bb
deleted file mode 100644
index 8f70df376e..0000000000
--- a/packages/zeecookbook/zeecookbook_1.0beta3.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Zee Cookbook is a cookbook application for Zaurus. \
-It lets you store, view and edit your recipes on your pda. \
-Zee Cookbook can import Meal-Master files and can \
-export recipes in Meal-Master format or in HTML."
-SECTION = "opie/applications"
-DEPENDS = "sqlite"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-SRC_URI = "http://zaurus.spy.org/feeds/docs-zaurus-com/zeecookbook-${PV}.zip"
-S = "${WORKDIR}/zeecookbook-${PV}/src/zeecookbook"
-
-inherit palmtop
-
-EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
-
-do_install () {
- tar xzf ../../ipk/zeecookbook_1.0beta3_arm.ipk
- tar xzf data.tar.gz
- cp -a opt ${D}
- install -m 0755 zeecookbook ${D}${palmtopdir}/bin/
-}
diff --git a/packages/zeecookbook/zeecookbook_1.1.bb b/packages/zeecookbook/zeecookbook_1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zeecookbook/zeecookbook_1.1.bb