aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Koroneos <skoroneos@digital-opsis.com>2008-05-04 21:26:34 +0000
committerStelios Koroneos <skoroneos@digital-opsis.com>2008-05-04 21:26:34 +0000
commitdb61d94094937dfc3504e15424c099f4a608acf3 (patch)
tree1fd2f1d6a231adea9ef15377e856b59ae100f922
parent0eb94e44bd4b64ad754d8c837d512e7000abd016 (diff)
parent1c67f708c41671468cdf2489d267d79ec30d5507 (diff)
downloadopenembedded-db61d94094937dfc3504e15424c099f4a608acf3.tar.gz
propagate from branch 'org.openembedded.oplinux' (head d9363ecbe581bf473057c4e79b0a93b7487d52e9)
to branch 'org.openembedded.dev' (head e6f495f12f6c3af3e3758acd3b907f88e88523ae)
-rw-r--r--classes/seppuku.bbclass10
-rw-r--r--conf/distro/angstrom-2008.1.conf25
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc2
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc3
-rw-r--r--conf/distro/include/angstrom-eglibc.inc2
-rw-r--r--conf/distro/include/angstrom-glibc.inc12
-rw-r--r--conf/distro/include/angstrom-uclibc.inc6
-rw-r--r--conf/distro/include/angstrom.inc10
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--conf/distro/jlime-donkey.conf53
-rw-r--r--conf/distro/jlime-henchman.conf106
-rw-r--r--conf/distro/jlime-mongo.conf107
-rw-r--r--conf/documentation.conf10
-rw-r--r--conf/machine/mp900c.conf13
-rwxr-xr-xcontrib/mtn2cl/mtn2cl.sh4
-rw-r--r--packages/alsa/alsa-utils_1.0.13.bb2
-rw-r--r--packages/bitchx/bitchx_1.1.bb2
-rw-r--r--packages/geany/.mtn2git_empty0
-rw-r--r--packages/geany/geany_0.14.bb13
-rw-r--r--packages/gnome/epiphany_2.22.1.bb17
-rw-r--r--packages/gnome/libsoup_2.2.100.bb3
-rw-r--r--packages/gnome/libsoup_2.4.1.bb19
-rw-r--r--packages/images/sdr-image.bb16
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map239
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-br.map285
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-de.map12
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-sp.map12
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-uk.map28
-rw-r--r--packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty0
-rw-r--r--packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch49
-rw-r--r--packages/libgcrypt/libgcrypt.inc10
-rw-r--r--packages/libgcrypt/libgcrypt_1.4.1.bb2
-rw-r--r--packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch219
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/l2-cache.patch38
-rw-r--r--packages/linux/linux-omap2_git.bb5
-rw-r--r--packages/mozilla/minimo/bug-322806.diff2
-rw-r--r--packages/perl/files/perl-5.8.8-gcc-4.2.patch2
-rw-r--r--packages/perl/perl-5.8.8/native-ssp.patch2
-rw-r--r--packages/xapian/xapian-core-native_1.0.5.bb5
-rw-r--r--packages/xapian/xapian-quickstart.inc20
-rw-r--r--packages/xapian/xapian-quickstartindex-native_1.0.bb9
-rw-r--r--packages/xapian/xapian-quickstartindex_1.0.bb20
-rw-r--r--packages/xapian/xapian-quickstartsearch_1.0.bb4
-rw-r--r--packages/xserver-common/files/kdrive-1.4-fixes.patch282
-rw-r--r--packages/xserver-common/xserver-common_1.22.bb2
-rw-r--r--packages/zaurusd/files/alsa-cxx00-default.state.patch2
46 files changed, 1560 insertions, 126 deletions
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass
index b7aa3e20f1..1bdee28fa1 100644
--- a/classes/seppuku.bbclass
+++ b/classes/seppuku.bbclass
@@ -32,7 +32,7 @@ def seppuku_login(opener, login, user, password):
the resulting page then
@param opened = cookie enabled urllib2 opener
- @param login = http://bugs.openembedded.org/query.cgi?
+ @param login = http://bugs.openembedded.net/query.cgi?
@param user = Your username
@param password = Your password
"""
@@ -116,12 +116,12 @@ def seppuku_find_bug_report(debug_file, opener, query, product, component, bugna
and the status.
@param opener = urllib2 opener
- @param query = e.g. http://bugs.openembedded.org/query.cgi?
+ @param query = e.g. http://bugs.openembedded.net/query.cgi?
@param product = search for this product
@param component = search for this component
@param bugname = the bug to search for
- http://bugs.openembedded.org/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com
+ http://bugs.openembedded.net/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com
but it does not support ctype=csv...
"""
import urllib
@@ -154,7 +154,7 @@ def seppuku_reopen_bug(poster, file, product, component, bug_number, bugname, te
Same as with opening a new report, some bits need to be inside the url
- http://bugs.openembedded.org/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo
+ http://bugs.openembedded.net/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo
"""
import urllib2
@@ -189,7 +189,7 @@ def seppuku_file_bug(poster, file, product, component, bugname, text):
Create a completely new bug report
- http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other
+ http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other
You are forced to add some default values to the bugzilla query and stop with '&'
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index eb83cbcbb5..6631dc2068 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -11,7 +11,7 @@
# with the org.openembedded.angstrom-2007.12-stable branch
#
# Use this at your own risk, we welcome bugreports filed at
-# http://bugs.openembedded.org
+# http://bugs.openembedded.net
#
# Again, in doubt, use DISTRO="angstrom-2007.1" with the
# org.openembedded.angstrom-2007.12-stable branch
@@ -70,12 +70,9 @@ KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_D
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-intermediate = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
-
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-intermediate ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
@@ -134,18 +131,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-
# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
@@ -222,5 +207,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \
openssh-sftp-server \
"
-SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index e38a3abd06..92c44fe630 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -255,5 +255,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \
openssh-sftp-server \
"
-SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 2612734422..382d562426 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
PREFERRED_VERSION_busybox = "1.9.2"
-PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
@@ -7,3 +7,4 @@ PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_dropbear = "0.50"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 837aec9f2d..394ec7c2d4 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -16,7 +16,7 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 29b34f9665..fd79eff276 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -5,11 +5,21 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+
+
TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 7c713e65ea..4b68293faf 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -3,6 +3,12 @@
PREFERRED_PROVIDER_virtual/libc = "uclibc"
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index f53f1fb8bd..f6330981c5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -284,11 +284,11 @@ TINDER_REPORT = "1"
# in their local.conf
# seppuku bbclass
-SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?"
-SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?"
-SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?"
+SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi?"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi?"
SEPPUKU_AUTOBUILD = "1"
SEPPUKU_PRODUCT = "Openembedded"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d04bb829be..8feb23d740 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,6 +14,8 @@
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-assassin ?= "41"
SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-uclibc ?= "21926"
+SRCREV_pn-uclibc-initial ?= "21926"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dbus-c++-native ?= "13131"
SRCREV_pn-dbus-c++ ?= "13131"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 3c4dc11bb8..b8c7dae22e 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -6,6 +6,9 @@
DISTRO_NAME = "jlime"
DISTRO_VERSION = "donkey"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
#<>----------------------------------------------------------------->
@@ -36,33 +39,40 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
#<>----------------------------------------------------------------->
#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
#<>-----------------------------------------------------------------<
-PREFERRED_VERSION_binutils = "2.17"
-PREFERRED_VERSION_binutils-cross = "2.17"
-PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7"
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
-PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+PREFERRED_VERSION_binutils-cross-sdk = "2.18"
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
+PREFERRED_VERSION_glibc-intermediate = "2.6.1"
#<>------------------------------------------------------------------>
#<>
#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
#<>------------------------------------------------------------------<
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
+#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
PREFERRED_PROVIDER_tslib = "tslib"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
#<>------------------------------------------------------------------>
+#<>
+#<>System-critical software with known working versions.
+#<>------------------------------------------------------------------<
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_busybox = "1.9.1"
+
+#<>------------------------------------------------------------------>
#<>Other Specific stuff.
#<>
#<>
@@ -90,8 +100,8 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests
#<>------------------------------------------------------------------<
QTE_VERSION = "2.3.10"
PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions-1.2.3.inc
#<>------------------------------------------------------------------>
@@ -119,9 +129,10 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
#<> General non-essential programs with known working versions
#<>
#<>------------------------------------------------------------------<
-PREFERRED_VERSION_irssi = "0.8.10"
-PREFERRED_VERSION_mc = "4.6.1"
-PREFERRED_VERSION_nano = "1.3.9"
-PREFERRED_VERSION_ncurses = "5.4"
-PREFERRED_VERSION_ncftp = "3.1.9"
-PREFERRED_VERSION_osb-jscore = "0.5.0" \ No newline at end of file
+PREFERRED_VERSION_tightvnc = "1.3.9"
+PREFERRED_VERSION_xmonobut = "0.4"
+PREFERRED_VERSION_konqueror-embedded = "20070212"
+#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
+PREFERRED_VERSION_icewm = "1.2.34"
+PREFERRED_VERSION_xchat = "1.8.11"
+PREFERRED_VERSION_rxvt = "2.6.4"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
new file mode 100644
index 0000000000..68353b0bd9
--- /dev/null
+++ b/conf/distro/jlime-henchman.conf
@@ -0,0 +1,106 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Henchman <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+# NEC Mobile Pro 900/900c handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Henchman"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra)
+#<>
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+ console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+#
+TARGET_OS = "linux"
+TARGET_FPU_arm = "fixed"
+TARGET_FPU_armeb = "fixed"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
new file mode 100644
index 0000000000..6fb00f1452
--- /dev/null
+++ b/conf/distro/jlime-mongo.conf
@@ -0,0 +1,107 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Mongo <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+# HP Jornada 720/728 handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Mongo"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra)
+#<>
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+ console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+#INHERIT += "package_tar"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+#
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 6c71bc00c7..f1abee076b 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -126,15 +126,15 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild"
SEPPUKU_USER[doc] = "The login-name for the bugzilla account"
SEPPUKU_PASS[doc] = "The password for this account"
-#SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?"
+#SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?"
SEPPUKU_LOGIN[doc] = "path to the login script of the bugzilla, note the ? at the end"
-#SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi"
+#SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi"
SEPPUKU_QUERY[doc] = "The query script of the bugzilla"
-#SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+#SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
-#SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+#SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
-#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi"
+#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi"
SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
diff --git a/conf/machine/mp900c.conf b/conf/machine/mp900c.conf
new file mode 100644
index 0000000000..37055be2bb
--- /dev/null
+++ b/conf/machine/mp900c.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: NEC Mobile Pro 900/900c
+#@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+require conf/machine/include/tune-xscale.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-mobilepro900"
+PCMCIA_MANAGER = "pcmciautils"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 15d2722a8b..c3bfc6ea3b 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -28,9 +28,9 @@ for i in * ; do \
done
cd ..
-wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null
+wget 'http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null
-wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null
+wget "http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null
NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`"
RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`"
diff --git a/packages/alsa/alsa-utils_1.0.13.bb b/packages/alsa/alsa-utils_1.0.13.bb
index e1ae7aa399..1e6af1ec09 100644
--- a/packages/alsa/alsa-utils_1.0.13.bb
+++ b/packages/alsa/alsa-utils_1.0.13.bb
@@ -8,7 +8,7 @@ PR = "r1"
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
# lazy hack. needs proper fixing in gettext.m4, see
-# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# http://bugs.openembedded.net/show_bug.cgi?id=2348
# please close bug and remove this comment when properly fixed
#
EXTRA_OECONF_linux-uclibc = "--disable-nls"
diff --git a/packages/bitchx/bitchx_1.1.bb b/packages/bitchx/bitchx_1.1.bb
index d99ef56d97..9fbeb08c35 100644
--- a/packages/bitchx/bitchx_1.1.bb
+++ b/packages/bitchx/bitchx_1.1.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
LICENSE = "BSD"
#PR = "-r1"
-SRC_URI = "http://www.bitchx.org/files/source/ircii-pana-${PV}-final.tar.gz \
+SRC_URI = "http://bitchx.sourceforge.net/ircii-pana-${PV}-final.tar.gz \
file://gcc34.patch;patch=1"
S = "${WORKDIR}/BitchX"
diff --git a/packages/geany/.mtn2git_empty b/packages/geany/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/geany/.mtn2git_empty
diff --git a/packages/geany/geany_0.14.bb b/packages/geany/geany_0.14.bb
new file mode 100644
index 0000000000..525f4cfa0a
--- /dev/null
+++ b/packages/geany/geany_0.14.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Text editor with some IDE functionality"
+HOMEPAGE = "http://geany.sf.net"
+SECTION = "editors"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-plugins --disable-vte"
diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb
new file mode 100644
index 0000000000..82f158eae2
--- /dev/null
+++ b/packages/gnome/epiphany_2.22.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+inherit gnome
+
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+ touch ${S}/gnome-doc-utils.make
+ sed -i -e s:help::g Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index e642b83cc7..a7d96ec8e4 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -13,7 +13,6 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/"
FILES_${PN}-doc = "${datadir}/"
do_stage() {
- rm -f ${PKG_CONFIG_DIR}/libsoup*
autotools_stage_all
- ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
+ cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
}
diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup_2.4.1.bb
new file mode 100644
index 0000000000..42e5decb05
--- /dev/null
+++ b/packages/gnome/libsoup_2.4.1.bb
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gnutls libxml2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+ cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb
index 28a62113ee..8ad9af7cca 100644
--- a/packages/images/sdr-image.bb
+++ b/packages/images/sdr-image.bb
@@ -2,11 +2,10 @@
# An image with tools for software defined radio and unicorn radio
# TODO:
-# http://poh9.blogspot.com/2008/02/for-my-own-future-reference-how-to.html
# X demo
# xorg.conf
-PR = "r2"
+PR = "r3"
IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
@@ -15,9 +14,10 @@ IMAGE_FSTYPES += "tar.bz2"
ANGSTROM_EXTRA_INSTALL ?= ""
DISTRO_SSH_DAEMON ?= "dropbear"
+XSERVER ?= "xserver-kdrive-fbdev"
# Install "big" X if the target has a screen
-GUIPACKAGES = " \
+GUIPACKAGES_BIGX = " \
xf86-input-evdev \
xf86-input-mouse \
xf86-video-dummy \
@@ -26,10 +26,18 @@ GUIPACKAGES = " \
xf86-video-vesa \
"
+GUIPACKAGES = " \
+ ${XSERVER} \
+ angstrom-x11-base-depends \
+ angstrom-gpe-task-base \
+ angstrom-gpe-task-settings \
+ xterm e-wm \
+"
+
IMAGE_INSTALL = " task-base-extended \
kernel-modules \
gnuradio gnuradio-usrp \
- gnuplot \
+ screen procps \
${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \
python-core perl \
uucp picocom \
diff --git a/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
new file mode 100644
index 0000000000..454a1dae68
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
@@ -0,0 +1,239 @@
+# English keymap for Jornada 620/660 devices.
+# for the jornada680.c driver
+#
+# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode 57 = Escape Escape
+ alt keycode 1 = Meta_Escape
+keycode 59 = one exclam asciitilde
+ alt keycode 2 = Meta_one
+keycode 60 = two at grave
+ alt keycode 3 = Meta_two
+keycode 61 = three numbersign
+ alt keycode 4 = Meta_three
+ altgr keycode 4 = pound
+keycode 66 = four dollar
+ control keycode 5 = Control_backslash
+ alt keycode 5 = Meta_four
+ altgr keycode 5 = currency
+keycode 65 = five percent
+ control keycode 6 = Control_bracketright
+ alt keycode 6 = Meta_five
+keycode 64 = six asciicircum
+ control keycode 7 = Control_asciicircum
+ alt keycode 7 = Meta_six
+keycode 62 = seven ampersand braceleft
+ control keycode 8 = Control_underscore
+ alt keycode 8 = KP_7
+keycode 63 = eight asterisk bracketleft
+ control keycode 9 = Delete
+ alt keycode 9 = KP_8
+keycode 58 = nine parenleft bracketright
+ alt keycode 10 = KP_9
+keycode 112 = zero parenright braceright
+ alt keycode 11 = KP_Divide
+keycode 29 = minus underscore backslash
+ control keycode 11 = Control_underscore
+ shift control keycode 11 = Control_underscore
+ alt keycode 11 = Meta_minus
+keycode 28 = equal plus
+ alt keycode 13 = Meta_equal
+keycode 88 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+keycode 76 = BackSpace
+keycode 32 = Tab Tab
+ alt keycode 58 = Meta_Tab
+keycode 45 = q
+keycode 46 = w
+keycode 47 = e
+ Shift keycode 18 = E
+keycode 52 = r
+keycode 51 = t
+keycode 50 = y
+ alt keycode 21 = KP_4
+keycode 48 = u
+ alt keycode 22 = KP_5
+keycode 49 = i
+ alt keycode 23 = KP_6
+keycode 53 = o
+ alt keycode 24 = KP_Multiply
+keycode 40 = p
+ AltGr keycode 25 = braceleft
+keycode 81 = backslash bar
+keycode 77 = bracketleft braceleft
+keycode 82 = bracketright braceright
+keycode 43 = Return
+ alt keycode 28 = Meta_Control_m
+keycode 1 = Control
+ altgr keycode 29 = Num_Lock
+keycode 68 = a
+keycode 89 = s
+keycode 67 = d
+keycode 75 = f
+keycode 69 = g
+keycode 70 = h
+ alt keycode 35 = KP_1
+keycode 56 = j
+ alt keycode 36 = KP_2
+keycode 123 = k
+ alt keycode 37 = KP_3
+keycode 80 = l
+ alt keycode 38 = KP_Subtract
+keycode 90 = semicolon colon bracketleft
+ alt keycode 39 = Meta_semicolon
+keycode 27 = apostrophe quotedbl bracketright
+ control keycode 40 = Control_g
+ alt keycode 40 = Meta_apostrophe
+keycode 41 = Shift
+keycode 74 = Caps_Lock
+keycode 18 = z
+keycode 42 = x
+keycode 71 = c
+keycode 37 = v
+keycode 79 = b
+keycode 87 = n
+ alt keycode 49 = KP_0
+keycode 78 = m
+ alt keycode 50 = KP_Comma
+keycode 55 = comma less
+ alt keycode 51 = KP_Period
+keycode 35 = period greater
+ control keycode 52 = Compose
+ alt keycode 52 = KP_Add
+keycode 54 = Shift
+keycode 73 = Alt
+keycode 23 = space space
+ alt keycode 57 = Meta_space
+keycode 15 = Control
+keycode 5 = F1
+keycode 10 = F2
+keycode 9 = F3
+keycode 8 = F4
+keycode 6 = F5
+keycode 7 = F6
+keycode 11 = F7
+keycode 12 = F8
+keycode 72 = Up
+ shift keycode 72 = Scroll_Backward
+ altgr keycode 72 = Scroll_Backward
+ alt keycode 72 = Prior
+keycode 25 = Left
+ altgr keycode 75 = Decr_Console
+ alt keycode 75 = Find
+keycode 125 = Right
+ altgr keycode 77 = Incr_Console
+ alt keycode 77 = Select
+keycode 26 = Down
+ shift keycode 80 = Scroll_Forward
+ altgr keycode 80 = Scroll_Forward
+ alt keycode 80 = Next
+keycode 88 = Remove Remove Meta_Delete
+ alt keycode 83 = Meta_Delete
+#keycode 112 = F10
+# shift keycode 112 = F20
+# altgr keycode 112 = Console_22
+# alt keycode 112 = Console_10
+# control alt keycode 112 = Console_10
+keycode 39 = slash question
+ control keycode 115 = Delete
+ alt keycode 115 = Meta_slash
+keycode 20 = AltGr
+keycode 219 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/keymaps/files/jornada6xx/keymap-br.map b/packages/keymaps/files/jornada6xx/keymap-br.map
new file mode 100644
index 0000000000..8bc0f0fab6
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-br.map
@@ -0,0 +1,285 @@
+# Brazilian keymap for Jornada 6xx devices.
+#
+# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk )
+# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com )
+# Mrazilian adaptation by Paulo Roberto ( stpaul <at> 0xbadc0ffe.org )
+# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode 1 = Escape Escape
+ alt keycode 1 = Meta_Escape
+keycode 2 = one exclam asciitilde
+ alt keycode 2 = Meta_one
+keycode 3 = two at grave
+ alt keycode 3 = Meta_two
+keycode 4 = three numbersign
+ alt keycode 4 = Meta_three
+ altgr keycode 4 = pound
+keycode 5 = four backslash
+ control keycode 5 = Control_backslash
+ alt keycode 5 = Meta_four
+ altgr keycode 5 = dollar
+keycode 6 = five percent
+ control keycode 6 = Control_bracketright
+ alt keycode 6 = Meta_five
+keycode 7 = six dead_diaeresis
+ AltGr keycode 7 = notsign
+ alt keycode 7 = Meta_six
+keycode 8 = seven ampersand braceleft
+ control keycode 8 = Control_underscore
+ alt keycode 8 = KP_7
+keycode 9 = eight asterisk bracketleft
+ control keycode 9 = Delete
+ alt keycode 9 = KP_8
+keycode 10 = nine parenleft bracketright
+ alt keycode 10 = KP_9
+keycode 11 = zero parenright braceright
+ alt keycode 11 = KP_Divide
+keycode 12 = minus underscore backslash
+ control keycode 11 = Control_underscore
+ shift control keycode 11 = Control_underscore
+ alt keycode 11 = Meta_minus
+keycode 13 = equal plus
+ alt keycode 13 = Meta_equal
+keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+keycode 15 = Tab Tab
+ alt keycode 15 = Meta_Tab
+keycode 16 = q
+ AltGr keycode 16 = slash
+keycode 17 = w
+ AltGr keycode 17 = question
+keycode 18 = e
+ AltGr keycode 18 = E
+keycode 19 = r
+keycode 20 = t
+keycode 21 = y
+keycode 22 = u
+ alt keycode 22 = KP_4
+keycode 23 = i
+ alt keycode 23 = KP_5
+keycode 24 = o
+ alt keycode 24 = KP_6
+keycode 25 = p
+ alt keycode 25 = KP_Multiply
+keycode 26 = dead_acute dead_grave
+keycode 27 = bracketleft braceleft
+ AltGr keycode 27 = ordfeminine
+keycode 28 = Return
+ alt keycode 28 = Meta_Control_m
+keycode 29 = F11
+ shift keycode 29 = F21
+ altgr keycode 29 = Console_23
+ alt keycode 29 = Console_11
+ control alt keycode 29 = Console_11
+keycode 30 = a
+ AltGr keycode 30 = degree
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+keycode 34 = g
+keycode 35 = h
+keycode 36 = j
+ alt keycode 36 = KP_1
+keycode 37 = k
+ alt keycode 37 = KP_2
+keycode 38 = l
+ alt keycode 38 = KP_3
+keycode 39 = +ccedilla +Ccedilla
+ alt keycode 38 = KP_Subtract
+keycode 40 = dead_tilde dead_circumflex
+ shift control keycode 40 = Control_asciicircum
+ alt keycode 40 = Meta_apostrophe
+keycode 42 = Shift
+ altgr keycode 42 = Caps_Lock
+keycode 43 = bracketright braceright
+ AltGr keycode 43 = masculine
+keycode 44 = z
+ AltGr keycode 44 = backslash
+keycode 45 = x
+ AltGr keycode 45 = bar
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+keycode 49 = n
+keycode 50 = m
+ alt keycode 49 = KP_0
+keycode 51 = comma less
+ alt keycode 50 = KP_Comma
+keycode 52 = period greater
+ control keycode 52 = Compose
+ alt keycode 51 = KP_Period
+keycode 53 = semicolon colon
+ alt keycode 52 = KP_Add
+keycode 54 = Shift
+keycode 55 = apostrophe
+keycode 56 = Alt
+keycode 57 = space space
+ alt keycode 57 = Meta_space
+keycode 58 = F9
+ shift keycode 58 = F19
+ altgr keycode 58 = Console_21
+ alt keycode 58 = Console_9
+ control alt keycode 58 = Console_9
+keycode 59 = F1
+ altgr keycode 59 = Console_13
+ alt keycode 59 = Console_1
+ control alt keycode 59 = Console_1
+keycode 60 = F2
+ shift keycode 60 = F12
+ altgr keycode 60 = Console_14
+ alt keycode 60 = Console_2
+ control alt keycode 60 = Console_2
+keycode 61 = F3
+ shift keycode 61 = F13
+ altgr keycode 61 = Console_15
+ alt keycode 61 = Console_3
+ control alt keycode 61 = Console_3
+keycode 62 = F4
+ shift keycode 62 = F14
+ altgr keycode 62 = Console_16
+ alt keycode 62 = Console_4
+ control alt keycode 62 = Console_4
+keycode 63 = F5
+ shift keycode 63 = F15
+ altgr keycode 63 = Console_17
+ alt keycode 63 = Console_5
+ control alt keycode 63 = Console_5
+keycode 64 = F6
+ shift keycode 64 = F16
+ altgr keycode 64 = Console_18
+ alt keycode 64 = Console_6
+ control alt keycode 64 = Console_6
+keycode 65 = F7
+ shift keycode 65 = F17
+ altgr keycode 65 = Console_19
+ alt keycode 65 = Console_7
+ control alt keycode 65 = Console_7
+keycode 66 = F8
+ shift keycode 66 = F18
+ altgr keycode 66 = Console_20
+ alt keycode 66 = Console_8
+ control alt keycode 66 = Console_8
+keycode 72 = Up
+ shift keycode 72 = Scroll_Backward
+ altgr keycode 72 = Scroll_Backward
+ alt keycode 72 = Prior
+keycode 74 = Control
+ altgr keycode 74 = Num_Lock
+keycode 75 = Left
+ altgr keycode 75 = Decr_Console
+ alt keycode 75 = Find
+keycode 77 = Right
+ altgr keycode 77 = Incr_Console
+ alt keycode 77 = Select
+keycode 80 = Down
+ shift keycode 80 = Scroll_Forward
+ altgr keycode 80 = Scroll_Forward
+ alt keycode 80 = Next
+keycode 83 = Remove Remove Meta_Delete
+ alt keycode 83 = Meta_Delete
+keycode 112 = F10
+ shift keycode 112 = F20
+ altgr keycode 112 = Console_22
+ alt keycode 112 = Console_10
+ control alt keycode 112 = Console_10
+keycode 115 = AltGr
+keycode 123 = comma quotedbl
+keycode 0 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/keymaps/files/jornada6xx/keymap-de.map b/packages/keymaps/files/jornada6xx/keymap-de.map
index 98083d2e58..4f6f53a74c 100644
--- a/packages/keymaps/files/jornada6xx/keymap-de.map
+++ b/packages/keymaps/files/jornada6xx/keymap-de.map
@@ -148,9 +148,9 @@ keycode 27 = plus asterisk asciitilde
keycode 28 = Return
shift altgr keycode 28 = VoidSymbol
alt keycode 28 = Meta_Control_m
-keycode 29 = Control
- shift keycode 29 = Compose
- shift altgr keycode 29 = VoidSymbol
+keycode 29 = F11 F23
+ control keycode 29 = Control_asciicircum
+ control alt keycode 29 = Meta_Control_asciicircum
keycode 30 = +a
shift keycode 30 = +A
shift altgr keycode 30 = VoidSymbol
@@ -243,9 +243,6 @@ keycode 38 = +l
control alt keycode 38 = Meta_Control_l
keycode 39 = +odiaeresis +Odiaeresis
keycode 40 = +adiaeresis +Adiaeresis
-keycode 41 = F11 F23
- control keycode 41 = Control_asciicircum
- control alt keycode 41 = Meta_Control_asciicircum
keycode 42 = Shift Shift Caps_Lock
shift altgr keycode 42 = VoidSymbol
control keycode 42 = Compose
@@ -373,6 +370,9 @@ keycode 66 = F8 F20 Console_20
keycode 72 = Up
alt keycode 72 = Prior
shift alt keycode 72 = Scroll_Backward
+keycode 74 = Control
+ shift keycode 74 = Compose
+ shift altgr keycode 74 = VoidSymbol
keycode 75 = KP_4
altgr keycode 75 = Hex_4
shift altgr keycode 75 = VoidSymbol
diff --git a/packages/keymaps/files/jornada6xx/keymap-sp.map b/packages/keymaps/files/jornada6xx/keymap-sp.map
index ba05387743..2e5d7388f0 100644
--- a/packages/keymaps/files/jornada6xx/keymap-sp.map
+++ b/packages/keymaps/files/jornada6xx/keymap-sp.map
@@ -60,8 +60,10 @@ keycode 26 = dead_acute
shift keycode 26 = dead_diaeresis
keycode 27 = plus asterisk asciitilde
keycode 28 = Return
-keycode 29 = Control
- AltGr keycode 29 = Num_Lock
+keycode 29 = F11
+ alt keycode 29 = Console_11
+ shift keycode 29 = F12
+ shift alt keycode 29 = Console_12
keycode 30 = +a
shift keycode 30 = +A
keycode 31 = +s
@@ -85,10 +87,6 @@ keycode 39 = +0244
keycode 40 = braceleft
shift keycode 40 = bracketleft
AltGr keycode 40 = dead_circumflex
-keycode 41 = F11
- alt keycode 41 = Console_11
- shift keycode 41 = F12
- shift alt keycode 41 = Console_12
keycode 42 = Shift
AltGr keycode 42 = Caps_Lock
keycode 43 = braceright
@@ -135,6 +133,8 @@ keycode 66 = F8
keycode 72 = Up
alt keycode 72 = PageUp
shift alt keycode 72 = Scroll_Backward
+keycode 74 = Control
+ AltGr keycode 74 = Num_Lock
keycode 75 = Left
alt keycode 75 = Home
keycode 77 = Right
diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map
index a7bb082464..6bb959801c 100644
--- a/packages/keymaps/files/jornada6xx/keymap-uk.map
+++ b/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -65,8 +65,11 @@ keycode 26 = backslash bar
AltGr keycode 26 = braceright
keycode 28 = Return
alt keycode 28 = Meta_Control_m
-keycode 29 = Control
- altgr keycode 29 = Num_Lock
+keycode 29 = F11
+ shift keycode 29 = F21
+ altgr keycode 29 = Console_23
+ alt keycode 29 = Console_11
+ control alt keycode 29 = Console_11
keycode 30 = a
keycode 31 = s
keycode 32 = d
@@ -84,12 +87,7 @@ keycode 39 = semicolon colon bracketleft
alt keycode 39 = Meta_semicolon
keycode 40 = apostrophe quotedbl bracketright
control keycode 40 = Control_g
- alt keycode 40 = Meta_apostrophe
-keycode 41 = F11
- shift keycode 41 = F21
- altgr keycode 41 = Console_23
- alt keycode 41 = Console_11
- control alt keycode 41 = Console_11
+ alt keycode 40 = Meta_apostrophe
keycode 42 = Shift
altgr keycode 42 = Caps_Lock
keycode 44 = z
@@ -158,6 +156,8 @@ keycode 72 = Up
shift keycode 72 = Scroll_Backward
altgr keycode 72 = Scroll_Backward
alt keycode 72 = Prior
+keycode 74 = Control
+ altgr keycode 74 = Num_Lock
keycode 75 = Left
altgr keycode 75 = Decr_Console
alt keycode 75 = Find
@@ -179,12 +179,12 @@ keycode 115 = slash question
control keycode 115 = Delete
alt keycode 115 = Meta_slash
keycode 123 = AltGr
-keycode 219 = Insert
-string F1 = "\033[11~"
-string F2 = "\033[12~"
-string F3 = "\033[13~"
-string F4 = "\033[14~"
-string F5 = "\033[15~"
+keycode 0 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
string F6 = "\033[17~"
string F7 = "\033[18~"
string F8 = "\033[19~"
diff --git a/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty
diff --git a/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch
new file mode 100644
index 0000000000..a4e5a65d65
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch
@@ -0,0 +1,49 @@
+Index: libgcrypt-1.4.0/configure.ac
+===================================================================
+--- libgcrypt-1.4.0.orig/configure.ac
++++ libgcrypt-1.4.0/configure.ac
+@@ -1072,6 +1072,7 @@ cipher/Makefile
+ doc/Makefile
+ src/Makefile
+ src/gcrypt.h
++src/libgcrypt.pc
+ src/libgcrypt-config
+ src/versioninfo.rc
+ tests/Makefile
+Index: libgcrypt-1.4.0/src/libgcrypt.pc.in
+===================================================================
+--- /dev/null
++++ libgcrypt-1.4.0/src/libgcrypt.pc.in
+@@ -0,0 +1,32 @@
++# Process this file with autoconf to produce a pkg-config metadata file.
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
++# Author: Simon Josefsson
++#
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++#
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@LIBGCRYPT_CONFIG_API_VERSION@
++
++# Misc information.
++symmetric_ciphers=@LIBGCRYPT_CIPHERS@
++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
++digests=@LIBGCRYPT_DIGESTS@
++
++Name: libgcrypt
++Description: GNU crypto library
++URL: http://www.gnupg.org
++Version: @VERSION@
++Libs: -L${libdir} -lgcrypt
++Libs.private: -L${libdir} -lgpg-error
++Cflags: -I${includedir}
diff --git a/packages/libgcrypt/libgcrypt.inc b/packages/libgcrypt/libgcrypt.inc
index 65f78db647..691f4fe133 100644
--- a/packages/libgcrypt/libgcrypt.inc
+++ b/packages/libgcrypt/libgcrypt.inc
@@ -7,16 +7,18 @@ DEPENDS = "libgpg-error"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
file://add-pkgconfig-support.patch;patch=1"
-inherit autotools binconfig pkgconfig
+inherit autotools binconfig pkgconfig lib_package
EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
ARM_INSTRUCTION_SET = "arm"
+do_install_append() {
+ install -d ${D}/${libdir}/pkgconfig/
+ cp ${S}/src/*.pc ${D}/${libdir}/pkgconfig/
+}
+
do_stage() {
autotools_stage_all
}
-# move libgcrypt-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
diff --git a/packages/libgcrypt/libgcrypt_1.4.1.bb b/packages/libgcrypt/libgcrypt_1.4.1.bb
new file mode 100644
index 0000000000..c0b5e6531c
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt_1.4.1.bb
@@ -0,0 +1,2 @@
+require libgcrypt.inc
+
diff --git a/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch
new file mode 100644
index 0000000000..0883322c28
--- /dev/null
+++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch
@@ -0,0 +1,219 @@
+RS485 auto mode support ported from 2.4 (diff against 2.6.19-rc6-git10)
+
+Signed-off-by: Petr Stetiar <ynezz@true.cz>
+
+diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
+index 4213fab..5b3c5ff 100644
+--- a/drivers/serial/amba-pl010.c
++++ b/drivers/serial/amba-pl010.c
+@@ -50,6 +50,7 @@
+ #include <linux/amba/serial.h>
+
+ #include <asm/io.h>
++#include <asm/hardware.h>
+
+ #define UART_NR 8
+
+@@ -65,6 +66,11 @@
+ #define UART_DUMMY_RSR_RX 256
+ #define UART_PORT_SIZE 64
+
++#ifdef CONFIG_MACH_TS72XX
++static void __iomem *ts_rs485_data9_register;
++static void __iomem *ts_rs485_control_register;
++#endif
++
+ /*
+ * We wrap our port structure around the generic uart_port.
+ */
+@@ -487,6 +493,107 @@ static int pl010_verify_port(struct uart
+ return ret;
+ }
+
++#ifdef CONFIG_MACH_TS72XX
++static int ts72xx_rs485_init(void)
++{
++ ts_rs485_data9_register = ioremap(TS72XX_RS485_DATA9_PHYS_BASE, 4096);
++ if (ts_rs485_data9_register == NULL) {
++ return -1;
++ }
++
++ ts_rs485_control_register = ioremap(TS72XX_RS485_CONTROL_PHYS_BASE, 4096);
++ if (ts_rs485_control_register == NULL) {
++ iounmap(ts_rs485_data9_register);
++ return -1;
++ }
++
++ return 0;
++}
++
++static int ts72xx_auto485(struct uart_port *port, unsigned int cmd, unsigned long *arg)
++{
++ int baud, cflag, mode;
++ int datalength;
++
++ mode = (int)*arg;
++ if (!is_rs485_installed()) {
++ printk("amba-pl010.c: this board does not support RS485 auto mode\n");
++ return -EINVAL;
++ }
++
++ if (port->line != 1) {
++ printk("amba-pl010.c: auto RS485 mode is only supported on second port (/dev/ttyAM1)\n");
++ return -EINVAL;
++ }
++
++ datalength = 8;
++ cflag = port->info->tty->termios->c_cflag ;
++ if (cflag & PARENB)
++ datalength++;
++
++ if (cflag & CSTOPB)
++ datalength++;
++
++ baud = tty_get_baud_rate(port->info->tty);
++
++ switch (cmd) {
++ case TIOC_SBCC485:
++ if ((mode & TS72XX_RS485_AUTO485FD) || (mode & TS72XX_RS485_AUTO485HD)) {
++ printk("amba-pl010.c: unsetting auto RS485 mode\n");
++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_control_register);
++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_data9_register);
++ }
++ break;
++ case TIOC_SBCS485:
++ if (mode & TS72XX_RS485_AUTO485FD) {
++ printk ("amba-pl010.c: setting FULL duplex auto RS485 mode\n");
++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_control_register);
++ if (datalength > 8)
++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register);
++ } else if (mode & TS72XX_RS485_AUTO485HD) {
++ printk("amba-pl010.c: setting HALF DUPLEX auto RS485 mode\n");
++ switch (baud) {
++ case 9600:
++ __raw_writew(TS72XX_RS485_MODE_9600_HD, ts_rs485_control_register);
++ break;
++ case 19200:
++ __raw_writew(TS72XX_RS485_MODE_19200_HD, ts_rs485_control_register);
++ break;
++ case 57600:
++ __raw_writew(TS72XX_RS485_MODE_57600_HD, ts_rs485_control_register);
++ break;
++ case 115200:
++ __raw_writew(TS72XX_RS485_MODE_115200_HD, ts_rs485_control_register);
++ break;
++ default:
++ printk("amba-pl010.c: %d baud rate is not supported for auto RS485 mode\n", baud);
++ return -1;
++ }
++ if (datalength > 8)
++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register);
++ }
++ break;
++ }
++
++ return 0;
++}
++#endif
++
++int pl010_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg)
++{
++#ifdef CONFIG_MACH_TS72XX
++ switch (cmd) {
++ case TIOC_SBCC485:
++ case TIOC_SBCS485:
++ return ts72xx_auto485(port, cmd, (unsigned long *)arg);
++ break;
++ default:
++ return -ENOIOCTLCMD;
++ }
++#endif
++ return -ENOIOCTLCMD;
++}
++
+ static struct uart_ops amba_pl010_pops = {
+ .tx_empty = pl010_tx_empty,
+ .set_mctrl = pl010_set_mctrl,
+@@ -504,6 +611,7 @@ static struct uart_ops amba_pl010_pops =
+ .request_port = pl010_request_port,
+ .config_port = pl010_config_port,
+ .verify_port = pl010_verify_port,
++ .ioctl = pl010_ioctl,
+ };
+
+ static struct uart_amba_port *amba_ports[UART_NR];
+@@ -746,6 +854,15 @@ static int __init pl010_init(void)
+ ret = uart_register_driver(&amba_reg);
+ if (ret == 0) {
+ ret = amba_driver_register(&pl010_driver);
++#ifdef CONFIG_MACH_TS72XX
++ if (!ret && is_rs485_installed()) {
++ ret = ts72xx_rs485_init();
++ if (ret)
++ printk("amba-pl010.c: ts72xx_rs485_init() failed\n");
++ else
++ printk("amba-pl010.c: auto RS485 mode initialized\n");
++ }
++#endif
+ if (ret)
+ uart_unregister_driver(&amba_reg);
+ }
+@@ -756,6 +873,10 @@ static void __exit pl010_exit(void)
+ {
+ amba_driver_unregister(&pl010_driver);
+ uart_unregister_driver(&amba_reg);
++#ifdef CONFIG_MACH_TS72XX
++ iounmap(ts_rs485_data9_register);
++ iounmap(ts_rs485_control_register);
++#endif
+ }
+
+ module_init(pl010_init);
+diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h
+index a94f63f..4c9396b 100644
+--- a/include/asm-arm/arch-ep93xx/ts72xx.h
++++ b/include/asm-arm/arch-ep93xx/ts72xx.h
+@@ -68,6 +68,16 @@
+ #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000
+ #define TS72XX_RTC_DATA_SIZE 0x00001000
+
++#define TS72XX_RS485_CONTROL_PHYS_BASE 0x22C00000
++#define TS72XX_RS485_DATA9_PHYS_BASE 0x23000000
++#define TS72XX_RS485_AUTO485FD 1
++#define TS72XX_RS485_AUTO485HD 2
++#define TS72XX_RS485_MODE_RS232 0x00
++#define TS72XX_RS485_MODE_FD 0x01
++#define TS72XX_RS485_MODE_9600_HD 0x04
++#define TS72XX_RS485_MODE_19200_HD 0x05
++#define TS72XX_RS485_MODE_57600_HD 0x06
++#define TS72XX_RS485_MODE_115200_HD 0x07
+
+ #ifndef __ASSEMBLY__
+ #include <asm/io.h>
+@@ -87,6 +100,12 @@ static inline int board_is_ts7260(void)
+ return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260;
+ }
+
++static inline int is_rs485_installed(void)
++{
++ return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &
++ TS72XX_OPTIONS_COM2_RS485);
++}
++
+ static inline int is_max197_installed(void)
+ {
+ return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &
+diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h
+index bb9a7aa..4d7dad1 100644
+--- a/include/asm-arm/ioctls.h
++++ b/include/asm-arm/ioctls.h
+@@ -66,6 +66,9 @@
+ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
+ #define FIOQSIZE 0x545E
+
++#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */
++#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */
++
+ /* Used for packet mode */
+ #define TIOCPKT_DATA 0
+ #define TIOCPKT_FLUSHREAD 1
diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch
new file mode 100644
index 0000000000..7e93c29036
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch
@@ -0,0 +1,38 @@
+diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
+index 15066c2..70f85c1 100644
+--- a/arch/arm/mm/Kconfig
++++ b/arch/arm/mm/Kconfig
+@@ -665,6 +665,12 @@ config CPU_CACHE_ROUND_ROBIN
+ Say Y here to use the predictable round-robin cache replacement
+ policy. Unless you specifically require this or are unsure, say N.
+
++config CPU_L2CACHE_DISABLE
++ bool "Disable level 2 cache"
++ depends on CPU_V7
++ help
++ Say Y here to disable the level 2 cache. If unsure, say N.
++
+ config CPU_BPREDICT_DISABLE
+ bool "Disable branch prediction"
+ depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7
+diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
+index a1d7331..432ddab 100644
+--- a/arch/arm/mm/proc-v7.S
++++ b/arch/arm/mm/proc-v7.S
+@@ -181,6 +181,16 @@ __v7_setup:
+ mcr p15, 0, r4, c2, c0, 1 @ load TTB1
+ mov r10, #0x1f @ domains 0, 1 = manager
+ mcr p15, 0, r10, c3, c0, 0 @ load domain access register
++#ifndef CONFIG_CPU_L2CACHE_DISABLE
++ @ L2 cache configuration in the L2 aux control register
++ mrc p15, 1, r10, c9, c0, 2
++ bic r10, r10, #(1 << 16) @ L2 outer cache
++ mcr p15, 1, r10, c9, c0, 2
++ @ L2 cache is enabled in the aux control register
++ mrc p15, 0, r10, c1, c0, 1
++ orr r10, r10, #2
++ mcr p15, 0, r10, c1, c0, 1
++#endif
+ #endif
+ adr r5, v7_crval
+ ldmia r5, {r5, r6}
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 4a3c3faf01..71bd173541 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,10 +2,10 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607"
+SRCREV = "547ba9200727d2334f779cbf46ab62accb1281aa"
PV = "2.6.25+git${SRCREV}"
-PR = "r6"
+PR = "r8"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,6 +13,7 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://usb-timout.patch;patch=1 \
+# file://l2-cache.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff
index e001e3fc67..c3e0ec2e9c 100644
--- a/packages/mozilla/minimo/bug-322806.diff
+++ b/packages/mozilla/minimo/bug-322806.diff
@@ -1,4 +1,4 @@
-See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
+See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.net/show_bug.cgi?id=1600
--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
diff --git a/packages/perl/files/perl-5.8.8-gcc-4.2.patch b/packages/perl/files/perl-5.8.8-gcc-4.2.patch
index d9869e1974..653a4758f4 100644
--- a/packages/perl/files/perl-5.8.8-gcc-4.2.patch
+++ b/packages/perl/files/perl-5.8.8-gcc-4.2.patch
@@ -1,4 +1,4 @@
-See http://bugs.openembedded.org/show_bug.cgi?id=2168
+See http://bugs.openembedded.net/show_bug.cgi?id=2168
Fix for gcc 4.2
--- perl-5.8.8/makedepend.SH.ark 2006-11-01 16:32:05.000000000 +0100
diff --git a/packages/perl/perl-5.8.8/native-ssp.patch b/packages/perl/perl-5.8.8/native-ssp.patch
index f815aad452..1c825f50d0 100644
--- a/packages/perl/perl-5.8.8/native-ssp.patch
+++ b/packages/perl/perl-5.8.8/native-ssp.patch
@@ -1,5 +1,5 @@
Fix for compiling with ssp enabled gcc:
-See http://bugs.openembedded.org/show_bug.cgi?id=1980
+See http://bugs.openembedded.net/show_bug.cgi?id=1980
diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
--- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000
diff --git a/packages/xapian/xapian-core-native_1.0.5.bb b/packages/xapian/xapian-core-native_1.0.5.bb
new file mode 100644
index 0000000000..d3c425f6c4
--- /dev/null
+++ b/packages/xapian/xapian-core-native_1.0.5.bb
@@ -0,0 +1,5 @@
+require xapian-core_${PV}.bb
+
+inherit native
+
+S = "${WORKDIR}/xapian-core-${PV}"
diff --git a/packages/xapian/xapian-quickstart.inc b/packages/xapian/xapian-quickstart.inc
new file mode 100644
index 0000000000..aab599f64b
--- /dev/null
+++ b/packages/xapian/xapian-quickstart.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Simplest possible indexer (from an older release of xapian)."
+HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "xapian-core"
+
+BINARY_NAME = ${@bb.data.getVar("PN",d,1).replace("xapian-","").replace("-native","")}
+S = "${WORKDIR}"
+
+SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/${BINARY_NAME}.cc"
+
+do_compile() {
+ ${CXX} ${CXXLAGS} ${LDFLAGS} -I${STAGING_INCDIR_NATIVE} -lxapian -o ${BINARY_NAME} ${BINARY_NAME}.cc
+}
+
+do_install() {
+ install -d ${D}$
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/
+}
diff --git a/packages/xapian/xapian-quickstartindex-native_1.0.bb b/packages/xapian/xapian-quickstartindex-native_1.0.bb
new file mode 100644
index 0000000000..fe84d4cbf5
--- /dev/null
+++ b/packages/xapian/xapian-quickstartindex-native_1.0.bb
@@ -0,0 +1,9 @@
+require xapian-quickstartindex_${PV}.bb
+
+DEPENDS = "xapian-core-native"
+
+inherit native
+
+do_stage() {
+ install -m 0744 ${WORKDIR}/${BINARY_NAME} ${STAGING_BINDIR}
+}
diff --git a/packages/xapian/xapian-quickstartindex_1.0.bb b/packages/xapian/xapian-quickstartindex_1.0.bb
index 6deff9191e..7a17f7b354 100644
--- a/packages/xapian/xapian-quickstartindex_1.0.bb
+++ b/packages/xapian/xapian-quickstartindex_1.0.bb
@@ -1,18 +1,4 @@
-DESCRIPTION = "Simplest possible indexer (from older release of xapian)"
-HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "xapian-core"
-PR = "r0"
+require xapian-quickstart.inc
-SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc"
-S = "${WORKDIR}"
-
-do_compile() {
- ${CXX} ${CXXLAGS} ${LDFLAGS} -lxapian -o quickstartindex quickstartindex.cc
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/quickstartindex ${D}${bindir}/
-}
+DESCRIPTION += "This package provides the tool for creating the index."
+PR = "r1"
diff --git a/packages/xapian/xapian-quickstartsearch_1.0.bb b/packages/xapian/xapian-quickstartsearch_1.0.bb
new file mode 100644
index 0000000000..c3381f6abd
--- /dev/null
+++ b/packages/xapian/xapian-quickstartsearch_1.0.bb
@@ -0,0 +1,4 @@
+require xapian-quickstart.inc
+
+DESCRIPTION += "This package provides the tool for searching the index."
+PR = "r1"
diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch
index dea824e19f..1526e73098 100644
--- a/packages/xserver-common/files/kdrive-1.4-fixes.patch
+++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch
@@ -1,5 +1,19 @@
---- /tmp/Xserver 2008-05-03 20:32:25.898796382 +0200
-+++ xserver-common-1.22/X11/Xserver 2008-05-03 20:35:37.557410270 +0200
+diff -Nurd xserver-common-1.22.old/X11/Xinit.d/12keymap xserver-common-1.22/X11/Xinit.d/12keymap
+--- xserver-common-1.22.old/X11/Xinit.d/12keymap 2008-02-07 16:53:16.000000000 +0100
++++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-05-04 17:30:48.278316443 +0200
+@@ -2,6 +2,9 @@
+
+ MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
++# since kdrive 1.4 there is no default keymap in server
++xmodmap - </etc/X11/default.xmodmap
++
+ case $MACHINE in
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ xmodmap - < /etc/X11/shepherd.xmodmap
+diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver
+--- xserver-common-1.22.old/X11/Xserver 2008-03-04 17:41:41.000000000 +0100
++++ xserver-common-1.22/X11/Xserver 2008-05-04 17:31:04.388313190 +0200
@@ -53,10 +53,14 @@
ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
fi
@@ -35,3 +49,267 @@
+echo "tslib: $TSLIB_TSDEVICE"
+echo "exec $XSERVER $ARGS $*"
exec $XSERVER $ARGS $*
+diff -Nurd xserver-common-1.22.old/X11/default.xmodmap xserver-common-1.22/X11/default.xmodmap
+--- xserver-common-1.22.old/X11/default.xmodmap 1970-01-01 01:00:00.000000000 +0100
++++ xserver-common-1.22/X11/default.xmodmap 2008-05-04 17:30:48.278316443 +0200
+@@ -0,0 +1,260 @@
++keycode 8 =
++keycode 9 = Escape
++keycode 10 = 1 exclam
++keycode 11 = 2 at
++keycode 12 = 3 numbersign
++keycode 13 = 4 dollar
++keycode 14 = 5 percent
++keycode 15 = 6 asciicircum
++keycode 16 = 7 ampersand braceleft
++keycode 17 = 8 asterisk bracketleft
++keycode 18 = 9 parenleft bracketright
++keycode 19 = 0 parenright braceright
++keycode 20 = minus underscore backslash
++keycode 21 = equal plus
++keycode 22 = BackSpace
++keycode 23 = Tab
++keycode 24 = q Q q
++keycode 25 = w W w
++keycode 26 = e E
++keycode 27 = r R r
++keycode 28 = t T t
++keycode 29 = y Y y
++keycode 30 = u U u
++keycode 31 = i I i
++keycode 32 = o O o
++keycode 33 = p P p
++keycode 34 = bracketleft braceleft
++keycode 35 = bracketright braceright asciitilde
++keycode 36 = Return
++keycode 37 = Control_L
++keycode 38 = a A
++keycode 39 = s S s
++keycode 40 = d D
++keycode 41 = f F
++keycode 42 = g G g
++keycode 43 = h H h
++keycode 44 = j J j
++keycode 45 = k K k
++keycode 46 = l L l
++keycode 47 = semicolon colon
++keycode 48 = apostrophe quotedbl
++keycode 49 = grave asciitilde
++keycode 50 = Shift_L
++keycode 51 = backslash bar
++keycode 52 = z Z z
++keycode 53 = x X x
++keycode 54 = c C
++keycode 55 = v V v
++keycode 56 = b B
++keycode 57 = n N n
++keycode 58 = m M m
++keycode 59 = comma less
++keycode 60 = period greater
++keycode 61 = slash question
++keycode 62 = Shift_R
++keycode 63 = KP_Multiply
++keycode 64 = Alt_L
++keycode 65 = space
++keycode 66 = Caps_Lock
++keycode 67 = F1 F11
++keycode 68 = F2 F12
++keycode 69 = F3 F13
++keycode 70 = F4 F14
++keycode 71 = F5 F15
++keycode 72 = F6 F16
++keycode 73 = F7 F17
++keycode 74 = F8 F18
++keycode 75 = F9 F19
++keycode 76 = F10 F20
++keycode 77 = Num_Lock
++keycode 78 = Scroll_Lock
++keycode 79 = KP_7
++keycode 80 = KP_8
++keycode 81 = KP_9
++keycode 82 = KP_Subtract
++keycode 83 = KP_4
++keycode 84 = KP_5
++keycode 85 = KP_6
++keycode 86 = KP_Add
++keycode 87 = KP_1
++keycode 88 = KP_2
++keycode 89 = KP_3
++keycode 90 = KP_0
++keycode 91 = KP_Decimal
++keycode 92 =
++keycode 93 =
++keycode 94 = less greater bar
++keycode 95 = F11
++keycode 96 = F12
++keycode 97 =
++keycode 98 =
++keycode 99 =
++keycode 100 =
++keycode 101 =
++keycode 102 =
++keycode 103 =
++keycode 104 = KP_Enter
++keycode 105 = Control_R
++keycode 106 = KP_Divide
++keycode 107 =
++keycode 108 = Mode_switch
++keycode 109 = Break
++keycode 110 = Home
++keycode 111 = Up
++keycode 112 = Prior
++keycode 113 = Left
++keycode 114 = Right
++keycode 115 = End
++keycode 116 = Down
++keycode 117 = Next
++keycode 118 = Insert
++keycode 119 = Delete
++keycode 120 = Menu
++keycode 121 = F13
++keycode 122 = F14
++keycode 123 = Help
++keycode 124 = Execute
++keycode 125 = F17
++keycode 126 = KP_Subtract
++keycode 127 = Pause
++keycode 128 =
++keycode 129 =
++keycode 130 =
++keycode 131 =
++keycode 132 =
++keycode 133 =
++keycode 134 =
++keycode 135 =
++keycode 136 =
++keycode 137 =
++keycode 138 =
++keycode 139 =
++keycode 140 =
++keycode 141 =
++keycode 142 =
++keycode 143 =
++keycode 144 =
++keycode 145 =
++keycode 146 =
++keycode 147 =
++keycode 148 =
++keycode 149 =
++keycode 150 =
++keycode 151 =
++keycode 152 =
++keycode 153 =
++keycode 154 =
++keycode 155 =
++keycode 156 =
++keycode 157 =
++keycode 158 =
++keycode 159 =
++keycode 160 =
++keycode 161 =
++keycode 162 =
++keycode 163 =
++keycode 164 =
++keycode 165 =
++keycode 166 =
++keycode 167 =
++keycode 168 =
++keycode 169 =
++keycode 170 =
++keycode 171 =
++keycode 172 =
++keycode 173 =
++keycode 174 =
++keycode 175 =
++keycode 176 =
++keycode 177 =
++keycode 178 =
++keycode 179 =
++keycode 180 =
++keycode 181 =
++keycode 182 =
++keycode 183 =
++keycode 184 =
++keycode 185 =
++keycode 186 =
++keycode 187 =
++keycode 188 =
++keycode 189 =
++keycode 190 =
++keycode 191 =
++keycode 192 =
++keycode 193 =
++keycode 194 =
++keycode 195 =
++keycode 196 =
++keycode 197 =
++keycode 198 =
++keycode 199 =
++keycode 200 =
++keycode 201 =
++keycode 202 =
++keycode 203 =
++keycode 204 =
++keycode 205 =
++keycode 206 =
++keycode 207 =
++keycode 208 =
++keycode 209 =
++keycode 210 =
++keycode 211 =
++keycode 212 =
++keycode 213 =
++keycode 214 =
++keycode 215 =
++keycode 216 =
++keycode 217 =
++keycode 218 =
++keycode 219 =
++keycode 220 =
++keycode 221 =
++keycode 222 =
++keycode 223 =
++keycode 224 =
++keycode 225 =
++keycode 226 =
++keycode 227 =
++keycode 228 =
++keycode 229 =
++keycode 230 =
++keycode 231 =
++keycode 232 =
++keycode 233 =
++keycode 234 =
++keycode 235 =
++keycode 236 =
++keycode 237 =
++keycode 238 =
++keycode 239 =
++keycode 240 =
++keycode 241 =
++keycode 242 =
++keycode 243 =
++keycode 244 =
++keycode 245 =
++keycode 246 =
++keycode 247 =
++keycode 248 =
++keycode 249 =
++keycode 250 =
++keycode 251 =
++keycode 252 =
++keycode 253 =
++keycode 254 =
++
++add shift = Shift_L
++add shift = Shift_R
++add shift = Menu
++add lock = Caps_Lock
++add control = Control_L
++add control = Control_R
++add mod1 = Alt_L
++add mod2 = Num_Lock
++!mod3
++add mod4 = Mode_switch
++!mod5
++
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index 018ca71adb..25f2abf148 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r3"
+PR = "r4"
PACKAGE_ARCH = "all"
diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch
index b10e6c85dd..b7a149be00 100644
--- a/packages/zaurusd/files/alsa-cxx00-default.state.patch
+++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch
@@ -1,4 +1,4 @@
-http://bugs.openembedded.org/show_bug.cgi?id=2617
+http://bugs.openembedded.net/show_bug.cgi?id=2617
- Fixes default ALSA state for SL-Cxx00.
* Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24).
* Increased Mic Levels and Boost.