summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-22 22:02:48 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-22 22:02:48 +0000
commit26a96fc12fb2df9e965087589da2ed6a3e39b5e4 (patch)
treeaa162fa89439bae50782e2528b02ed2a407c3131
parentd18457f094de8532eb8921991303032cdb345fe9 (diff)
downloadpoky-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.gz
Updates against mainline OE to fix various issues and make builds work again as a couple of poky changes got lost
git-svn-id: https://svn.o-hand.com/repos/poky@29 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/conf/machine/tune-arm926ejs.conf3
-rw-r--r--openembedded/packages/dbus/dbus-0.50/dbus-1.init86
-rw-r--r--openembedded/packages/dbus/dbus-0.50/no-bindings.patch12
-rw-r--r--openembedded/packages/dbus/dbus-0.50/no-introspect.patch14
-rw-r--r--openembedded/packages/dbus/dbus-native_0.50.bb16
-rw-r--r--openembedded/packages/dbus/dbus/no-examples.patch8
-rw-r--r--openembedded/packages/dbus/dbus_0.50.bb14
-rw-r--r--openembedded/packages/dbus/dbus_0.50.inc65
-rwxr-xr-xopenembedded/packages/gnome/gconf-dbus_cvs.bb4
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map393
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map393
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.154.bb (renamed from openembedded/packages/ipkg/ipkg-native_0.99.152.bb)0
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.154.bb (renamed from openembedded/packages/ipkg/ipkg_0.99.152.bb)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb5
-rw-r--r--openembedded/packages/maemo/nokia770-init_1.0.bb4
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools_3.1.bb60
-rw-r--r--openembedded/packages/pcmciautils/pcmciautils_010.bb12
-rw-r--r--openembedded/packages/udev/files/devfs-udev.rules108
-rw-r--r--openembedded/packages/udev/udev.inc3
-rw-r--r--openembedded/packages/udev/udev_070.bb2
-rw-r--r--openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch22
-rw-r--r--openembedded/packages/x11/x11_6.2.1.bb3
22 files changed, 1210 insertions, 17 deletions
diff --git a/openembedded/conf/machine/tune-arm926ejs.conf b/openembedded/conf/machine/tune-arm926ejs.conf
index 563586c902..5374c55dcc 100644
--- a/openembedded/conf/machine/tune-arm926ejs.conf
+++ b/openembedded/conf/machine/tune-arm926ejs.conf
@@ -1,2 +1,3 @@
1TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" 1#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
2TARGET_CC_ARCH = "-march=armv5te"
2PACKAGE_ARCH = "armv5te" 3PACKAGE_ARCH = "armv5te"
diff --git a/openembedded/packages/dbus/dbus-0.50/dbus-1.init b/openembedded/packages/dbus/dbus-0.50/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/openembedded/packages/dbus/dbus-0.50/dbus-1.init
@@ -0,0 +1,86 @@
1#! /bin/sh
2# -*- coding: utf-8 -*-
3# Debian init.d script for D-BUS
4# Copyright © 2003 Colin Walters <walters@debian.org>
5
6set -e
7
8DAEMON=/usr/bin/dbus-daemon
9NAME=dbus-1
10DAEMONUSER=messagebus
11PIDDIR=/var/run/dbus
12PIDFILE=$PIDDIR/pid
13DESC="system message bus"
14EVENTDIR=/etc/dbus-1/event.d
15
16test -x $DAEMON || exit 0
17
18# Source defaults file; edit that file to configure this script.
19ENABLED=1
20PARAMS=""
21if [ -e /etc/default/dbus-1 ]; then
22 . /etc/default/dbus-1
23fi
24
25test "$ENABLED" != "0" || exit 0
26
27start_it_up()
28{
29 if [ ! -d $PIDDIR ]; then
30 mkdir -p $PIDDIR
31 chown $DAEMONUSER $PIDDIR
32 chgrp $DAEMONUSER $PIDDIR
33 fi
34 if [ -e $PIDFILE ]; then
35 PIDDIR=/proc/$(cat $PIDFILE)
36 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
37 echo "$DESC already started; not starting."
38 else
39 echo "Removing stale PID file $PIDFILE."
40 rm -f $PIDFILE
41 fi
42 fi
43 echo -n "Starting $DESC: "
44 start-stop-daemon --start --quiet --pidfile $PIDFILE \
45 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
46 echo "$NAME."
47 if [ -d $EVENTDIR ]; then
48 run-parts --arg=start $EVENTDIR
49 fi
50}
51
52shut_it_down()
53{
54 if [ -d $EVENTDIR ]; then
55 run-parts --reverse --arg=stop $EVENTDIR
56 fi
57 echo -n "Stopping $DESC: "
58 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
59 --user $DAEMONUSER
60 # We no longer include these arguments so that start-stop-daemon
61 # can do its job even given that we may have been upgraded.
62 # We rely on the pidfile being sanely managed
63 # --exec $DAEMON -- --system $PARAMS
64 echo "$NAME."
65 rm -f $PIDFILE
66}
67
68case "$1" in
69 start)
70 start_it_up
71 ;;
72 stop)
73 shut_it_down
74 ;;
75 restart|force-reload)
76 shut_it_down
77 sleep 1
78 start_it_up
79 ;;
80 *)
81 echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
82 exit 1
83 ;;
84esac
85
86exit 0
diff --git a/openembedded/packages/dbus/dbus-0.50/no-bindings.patch b/openembedded/packages/dbus/dbus-0.50/no-bindings.patch
new file mode 100644
index 0000000000..ccfc3f88b2
--- /dev/null
+++ b/openembedded/packages/dbus/dbus-0.50/no-bindings.patch
@@ -0,0 +1,12 @@
1--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:05:38 +0200
2+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:06:30 +0200
3@@ -6,9 +6,6 @@
4 nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
5 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
6
7-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
8- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
9-
10 BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
11
12 else
diff --git a/openembedded/packages/dbus/dbus-0.50/no-introspect.patch b/openembedded/packages/dbus/dbus-0.50/no-introspect.patch
new file mode 100644
index 0000000000..1e43dd121b
--- /dev/null
+++ b/openembedded/packages/dbus/dbus-0.50/no-introspect.patch
@@ -0,0 +1,14 @@
1--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:03:49 +0200
2+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:04:28 +0200
3@@ -21,11 +21,6 @@
4 GTK_TOOLS=
5 endif
6
7-if HAVE_GLIB
8-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
9- DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
10-endif
11-
12 bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
13
14 dbus_send_SOURCES= \
diff --git a/openembedded/packages/dbus/dbus-native_0.50.bb b/openembedded/packages/dbus/dbus-native_0.50.bb
new file mode 100644
index 0000000000..916f7ad8e2
--- /dev/null
+++ b/openembedded/packages/dbus/dbus-native_0.50.bb
@@ -0,0 +1,16 @@
1include dbus_${PV}.inc
2
3SRC_URI_EXTRA=""
4
5inherit native
6
7S = "${WORKDIR}/dbus-${PV}"
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
9DEPENDS = "glib-2.0-native"
10
11do_stage() {
12 install -d ${STAGING_DATADIR}/dbus
13 install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
14 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
15}
16
diff --git a/openembedded/packages/dbus/dbus/no-examples.patch b/openembedded/packages/dbus/dbus/no-examples.patch
new file mode 100644
index 0000000000..8767705cee
--- /dev/null
+++ b/openembedded/packages/dbus/dbus/no-examples.patch
@@ -0,0 +1,8 @@
1--- dbus-0.36.2/glib/Makefile.am.orig 2005-09-06 17:30:26 +0200
2+++ dbus-0.36.2/glib/Makefile.am 2005-09-06 17:30:34 +0200
3@@ -1,4 +1,4 @@
4-SUBDIRS = . examples
5+SUBDIRS = .
6
7 INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
8
diff --git a/openembedded/packages/dbus/dbus_0.50.bb b/openembedded/packages/dbus/dbus_0.50.bb
new file mode 100644
index 0000000000..a1d19897cc
--- /dev/null
+++ b/openembedded/packages/dbus/dbus_0.50.bb
@@ -0,0 +1,14 @@
1include dbus_${PV}.inc
2
3
4DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
5DEFAULT_PREFERENCE = "-1"
6SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
7
8FILES_${PN} += "${bindir}/dbus-daemon"
9FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
10
11do_configure_prepend() {
12 install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
13 install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
14}
diff --git a/openembedded/packages/dbus/dbus_0.50.inc b/openembedded/packages/dbus/dbus_0.50.inc
new file mode 100644
index 0000000000..094a9b68d6
--- /dev/null
+++ b/openembedded/packages/dbus/dbus_0.50.inc
@@ -0,0 +1,65 @@
1SECTION = "base"
2PR = "r0"
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL"
6DEPENDS = "expat glib-2.0 virtual/libintl"
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
10 file://cross.patch;patch=1 \
11 file://tmpdir.patch;patch=1 \
12 file://dbus-1.init \
13 file://no-examples.patch;patch=1 \
14 ${SRC_URI_EXTRA}"
15
16inherit autotools pkgconfig update-rc.d gettext
17
18INITSCRIPT_NAME = "dbus-1"
19INITSCRIPT_PARAMS = "defaults"
20
21CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
22
23FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
24FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
25
26pkg_postinst_dbus() {
27#!/bin/sh
28
29# can't do adduser stuff offline
30if [ "x$D" != "x" ]; then
31 exit 1
32fi
33
34MESSAGEUSER=messagebus
35MESSAGEHOME=/var/run/dbus
36
37mkdir -p $MESSAGEHOME || true
38chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
39chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
40}
41
42EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
43 --disable-checks --disable-xml-docs --disable-doxygen-docs \
44 --with-xml=expat --without-x"
45
46
47do_stage () {
48 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
49 oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
50
51 autotools_stage_includes
52
53 mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
54 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
55}
56
57do_install_append () {
58 install -d ${D}${sysconfdir}/init.d
59 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
60}
61
62python populate_packages_prepend () {
63 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
64 bb.data.setVar('PKG_dbus', 'dbus-1', d)
65}
diff --git a/openembedded/packages/gnome/gconf-dbus_cvs.bb b/openembedded/packages/gnome/gconf-dbus_cvs.bb
index 65deaf5b21..a403fae24c 100755
--- a/openembedded/packages/gnome/gconf-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gconf-dbus_cvs.bb
@@ -4,9 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication."
4LICENSE = "GPL" 4LICENSE = "GPL"
5MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" 5MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
6PROVIDES = "gconf" 6PROVIDES = "gconf"
7RPROVIDES = "gconf" 7RPROVIDES_${PN} = "gconf"
8RPROVIDES_${PN}-dev = "gconf-dev"
8 9
9PV = "0.0cvs${CVSDATE}" 10PV = "0.0cvs${CVSDATE}"
11PR = "r6"
10 12
11SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ 13SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
12 file://gconf-dbus-update.patch;patch=1;pnum=0 \ 14 file://gconf-dbus-update.patch;patch=1;pnum=0 \
diff --git a/openembedded/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map
new file mode 100644
index 0000000000..285b597c99
--- /dev/null
+++ b/openembedded/packages/initscripts/initscripts-1.0/collie/keymap-2.6.map
@@ -0,0 +1,393 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10# In fact AltGr is used very little, and one more keymap can
11# be saved by mapping AltGr to Alt (and adapting a few entries):
12# keycode 100 = Alt
13#
14# Note:
15# The way in which the modifiers are handled are quite different
16# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
17#
18# Here, we simply pass up Fn as Control, and the german accent key
19# as Altgr, and simply use a proper keymap. Said keymap is as
20# follows.
21# keymaps 0-2,4-5,8,12,20
22keycode 1 = Escape Escape
23 alt keycode 1 = Meta_Escape
24keycode 2 = one exclam
25 alt keycode 2 = Meta_one
26keycode 3 = two at at
27 control keycode 3 = nul
28 shift control keycode 3 = nul
29 alt keycode 3 = Meta_two
30keycode 4 = three numbersign
31 control keycode 4 = Escape
32 alt keycode 4 = Meta_three
33keycode 5 = four dollar dollar
34 control keycode 5 = Control_backslash
35 alt keycode 5 = Meta_four
36keycode 6 = five percent
37 control keycode 6 = Control_bracketright
38 alt keycode 6 = Meta_five
39keycode 7 = six asciicircum
40 control keycode 7 = Control_asciicircum
41 alt keycode 7 = Meta_six
42keycode 8 = seven ampersand braceleft
43 control keycode 8 = Control_underscore
44 alt keycode 8 = Meta_seven
45keycode 9 = eight asterisk bracketleft
46 control keycode 9 = Delete
47 alt keycode 9 = Meta_eight
48keycode 10 = nine parenleft bracketright
49 alt keycode 10 = Meta_nine
50keycode 11 = zero parenright braceright
51 alt keycode 11 = Meta_zero
52keycode 12 = minus underscore backslash
53 control keycode 12 = Control_underscore
54 shift control keycode 12 = Control_underscore
55 alt keycode 12 = Meta_minus
56keycode 13 = equal plus
57 alt keycode 13 = Meta_equal
58keycode 14 = Delete Delete
59 control keycode 14 = BackSpace
60 alt keycode 14 = Meta_Delete
61keycode 14 = BackSpace
62 shift keycode 14 = BackSpace
63 control keycode 14 = Delete
64 shiftl control keycode 14 = bracketleft
65 control shiftr keycode 14 = bracketleft
66keycode 15 = Tab Tab
67 alt keycode 15 = Meta_Tab
68 shift keycode 15 = backslash
69 control keycode 15 = Caps_Lock
70 shiftl control keycode 15 = Caps_Lock
71 control shiftr keycode 15 = Caps_Lock
72keycode 16 = q
73 control keycode 16 = one
74 shiftl control keycode 16 = Control_q
75 control shiftr keycode 16 = Meta_q
76keycode 17 = w
77keycode 18 = e
78 altgr keycode 18 = Hex_E
79 control keycode 17 = two
80 shiftl control keycode 17 = Control_w
81 control shiftr keycode 17 = Meta_w
82keycode 18 = e
83 control keycode 18 = three
84 shiftl control keycode 18 = Control_e
85 control shiftr keycode 18 = Meta_e
86keycode 19 = r
87 control keycode 19 = four
88 shiftr control keycode 19 = Control_r
89 control shiftl keycode 19 = Meta_r
90keycode 20 = t
91 control keycode 20 = five
92 shiftl control keycode 20 = Control_t
93 control shiftr keycode 20 = Meta_t
94keycode 21 = y
95 control keycode 21 = six
96 shiftl control keycode 21 = Control_y
97 control shiftr keycode 21 = Meta_y
98keycode 22 = u
99 control keycode 22 = seven
100 shiftl control keycode 22 = Control_u
101 control shiftr keycode 22 = Meta_u
102keycode 23 = i
103 control keycode 23 = eight
104 shiftl control keycode 23 = Control_i
105 control shiftr keycode 23 = Meta_i
106keycode 24 = o
107 control keycode 24 = nine
108 shiftl control keycode 24 = Control_o
109 control shiftr keycode 24 = Meta_o
110keycode 25 = p
111keycode 26 = bracketleft braceleft
112 control keycode 26 = Escape
113 alt keycode 26 = Meta_bracketleft
114keycode 27 = bracketright braceright asciitilde
115 control keycode 27 = Control_bracketright
116 alt keycode 27 = Meta_bracketright
117 control keycode 25 = zero
118 shiftl control keycode 25 = Control_p
119 control shiftr keycode 25 = Meta_p
120keycode 28 = Return
121 alt keycode 28 = Meta_Control_m
122 control keycode 28 = greater
123 shiftl control keycode 28 = braceright
124 control shiftr keycode 28 = braceright
125keycode 29 = Control
126keycode 30 = a
127 altgr keycode 30 = Hex_A
128keycode 30 = a
129 control keycode 30 = exclam
130 shiftl control keycode 30 = Control_a
131 control shiftr keycode 30 = Meta_a
132keycode 31 = s
133keycode 32 = d
134 altgr keycode 32 = Hex_D
135keycode 33 = f
136 altgr keycode 33 = Hex_F
137 control keycode 31 = at
138 shiftl control keycode 31 = Control_s
139 control shiftr keycode 31 = Meta_s
140keycode 32 = d
141 control keycode 32 = numbersign
142 shiftl control keycode 32 = Control_d
143 control shiftr keycode 32 = Meta_d
144keycode 33 = f
145 control keycode 33 = dollar
146 shiftl control keycode 33 = Control_f
147 control shiftr keycode 33 = Meta_f
148keycode 34 = g
149 control keycode 34 = percent
150 shiftl control keycode 34 = Control_g
151 control shiftr keycode 34 = Meta_g
152keycode 35 = h
153 control keycode 35 = underscore
154 shiftl control keycode 35 = BackSpace
155 control shiftr keycode 35 = BackSpace
156keycode 36 = j
157 control keycode 36 = ampersand
158 shiftl control keycode 36 = Linefeed
159 control shiftr keycode 36 = Linefeed
160keycode 37 = k
161 control keycode 37 = asterisk
162 shiftl control keycode 37 = Control_k
163 control shiftr keycode 37 = Meta_k
164keycode 38 = l
165keycode 39 = semicolon colon
166 alt keycode 39 = Meta_semicolon
167keycode 40 = apostrophe quotedbl
168 control keycode 40 = Control_g
169 alt keycode 40 = Meta_apostrophe
170keycode 41 = grave asciitilde
171 control keycode 41 = nul
172 alt keycode 41 = Meta_grave
173 control keycode 38 = parenleft
174 shiftl control keycode 38 = Control_l
175 control shiftr keycode 38 = Meta_l
176keycode 40 = apostrophe quotedbl
177 control keycode 40 = asciitilde
178 shiftl control keycode 40 = asciicircum
179 control shiftr keycode 40 = asciicircum
180keycode 42 = Shift
181keycode 43 = backslash bar
182 control keycode 43 = Control_backslash
183 alt keycode 43 = Meta_backslash
184keycode 44 = z
185 control keycode 44 = Control_z
186 shiftl control keycode 44 = Control_z
187 control shiftr keycode 44 = Meta_z
188keycode 45 = x
189keycode 46 = c
190 altgr keycode 46 = Hex_C
191 control keycode 45 = Control_x
192 shiftl control keycode 45 = Control_x
193 control shiftr keycode 45 = Meta_x
194keycode 46 = c
195 control keycode 46 = Control_c
196 shiftl control keycode 46 = Control_c
197 control shiftr keycode 46 = Meta_c
198keycode 47 = v
199keycode 48 = b
200 altgr keycode 48 = Hex_B
201 control keycode 47 = Control_v
202 shiftl control keycode 47 = Control_v
203 control shiftr keycode 47 = Meta_v
204## current location ##
205keycode 48 = b
206 control keycode 48 = minus
207 shiftl control keycode 48 = Control_b
208 control shiftr keycode 48 = Meta_b
209keycode 49 = n
210 control keycode 49 = plus
211 shiftl control keycode 49 = Control_n
212 control shiftr keycode 49 = Meta_n
213keycode 50 = m
214keycode 51 = comma less
215 alt keycode 51 = Meta_comma
216keycode 52 = period greater
217 control keycode 52 = Compose
218 alt keycode 52 = Meta_period
219keycode 53 = slash question
220 control keycode 53 = Delete
221 alt keycode 53 = Meta_slash
222 control keycode 50 = equal
223 shiftl control keycode 50 = Control_m
224 control shiftr keycode 50 = Meta_m
225keycode 51 = comma
226 shift keycode 51 = semicolon
227 control keycode 51 = parenright
228 shiftl control keycode 51 = bracketright
229 control shiftr keycode 51 = bracketright
230keycode 52 = period
231 shift keycode 52 = colon
232 control keycode 52 = less
233 shiftl control keycode 52 = braceleft
234 control shiftr keycode 52 = braceleft
235keycode 53 = slash
236 shift keycode 53 = question
237 control keycode 53 = Num_Lock
238 shiftl control keycode 53 = Num_Lock
239 control shiftr keycode 53 = Num_Lock
240keycode 54 = Shift
241keycode 55 = KP_Multiply
242keycode 56 = Alt
243keycode 57 = space space
244 control keycode 57 = nul
245 alt keycode 57 = Meta_space
246keycode 58 = Caps_Lock
247keycode 59 = F1 F11 Console_13
248 control keycode 59 = F1
249 alt keycode 59 = Console_1
250 control alt keycode 59 = Console_1
251keycode 60 = F2 F12 Console_14
252 control keycode 60 = F2
253 alt keycode 60 = Console_2
254 control alt keycode 60 = Console_2
255keycode 61 = F3 F13 Console_15
256 control keycode 61 = F3
257 alt keycode 61 = Console_3
258 control alt keycode 61 = Console_3
259keycode 62 = F4 F14 Console_16
260 control keycode 62 = F4
261 alt keycode 62 = Console_4
262 control alt keycode 62 = Console_4
263keycode 63 = F5 F15 Console_17
264 control keycode 63 = F5
265 alt keycode 63 = Console_5
266 control alt keycode 63 = Console_5
267keycode 64 = F6 F16 Console_18
268 control keycode 64 = F6
269 alt keycode 64 = Console_6
270 control alt keycode 64 = Console_6
271keycode 65 = F7 F17 Console_19
272 control keycode 65 = F7
273 alt keycode 65 = Console_7
274 control alt keycode 65 = Console_7
275keycode 66 = F8 F18 Console_20
276 control keycode 66 = F8
277 alt keycode 66 = Console_8
278 control alt keycode 66 = Console_8
279keycode 67 = F9 F19 Console_21
280 control keycode 67 = F9
281 alt keycode 67 = Console_9
282 control alt keycode 67 = Console_9
283keycode 68 = F10 F20 Console_22
284 control keycode 68 = F10
285 alt keycode 68 = Console_10
286 control alt keycode 68 = Console_10
287keycode 69 = Num_Lock
288 shift keycode 69 = Bare_Num_Lock
289keycode 70 = Scroll_Lock Show_Memory Show_Registers
290 control keycode 70 = Show_State
291 alt keycode 70 = Scroll_Lock
292keycode 71 = KP_7
293 alt keycode 71 = Ascii_7
294 altgr keycode 71 = Hex_7
295keycode 72 = KP_8
296 alt keycode 72 = Ascii_8
297 altgr keycode 72 = Hex_8
298keycode 73 = KP_9
299 alt keycode 73 = Ascii_9
300 altgr keycode 73 = Hex_9
301keycode 74 = KP_Subtract
302keycode 75 = KP_4
303 alt keycode 75 = Ascii_4
304 altgr keycode 75 = Hex_4
305keycode 76 = KP_5
306 alt keycode 76 = Ascii_5
307 altgr keycode 76 = Hex_5
308keycode 77 = KP_6
309 alt keycode 77 = Ascii_6
310 altgr keycode 77 = Hex_6
311keycode 78 = KP_Add
312keycode 79 = KP_1
313 alt keycode 79 = Ascii_1
314 altgr keycode 79 = Hex_1
315keycode 80 = KP_2
316 alt keycode 80 = Ascii_2
317 altgr keycode 80 = Hex_2
318keycode 81 = KP_3
319 alt keycode 81 = Ascii_3
320 altgr keycode 81 = Hex_3
321keycode 82 = KP_0
322 alt keycode 82 = Ascii_0
323 altgr keycode 82 = Hex_0
324keycode 83 = KP_Period
325# altgr control keycode 83 = Boot
326 control alt keycode 83 = Boot
327keycode 84 = Last_Console
328keycode 85 =
329keycode 86 = less greater bar
330 alt keycode 86 = Meta_less
331keycode 87 = F11 F11 Console_23
332 control keycode 87 = F11
333 alt keycode 87 = Console_11
334 control alt keycode 87 = Console_11
335keycode 88 = F12 F12 Console_24
336 control keycode 88 = F12
337 alt keycode 88 = Console_12
338 control alt keycode 88 = Console_12
339keycode 89 =
340keycode 90 =
341keycode 91 =
342keycode 92 =
343keycode 93 =
344keycode 94 =
345keycode 95 =
346keycode 96 = KP_Enter
347keycode 57 = space
348 shift keycode 57 = bar
349 control keycode 57 = nul
350 shiftl control keycode 57 = grave
351 control shiftr keycode 57 = grave
352keycode 97 = Control
353keycode 98 = KP_Divide
354keycode 99 = Control_backslash
355 control keycode 99 = Control_backslash
356 alt keycode 99 = Control_backslash
357keycode 100 = AltGr
358keycode 101 = Break
359keycode 102 = Find
360keycode 103 = Up
361keycode 104 = Prior
362 shift keycode 104 = Scroll_Backward
363keycode 105 = Left
364 alt keycode 105 = Decr_Console
365keycode 106 = Right
366 alt keycode 106 = Incr_Console
367keycode 107 = Select
368keycode 108 = Down
369keycode 109 = Next
370 shift keycode 109 = Scroll_Forward
371keycode 110 = Insert
372keycode 111 = Remove
373# altgr control keycode 111 = Boot
374 control alt keycode 111 = Boot
375keycode 112 = Macro
376keycode 113 = F13
377keycode 114 = F14
378keycode 115 = Help
379keycode 116 = Do
380keycode 117 = F17
381keycode 118 = KP_MinPlus
382keycode 119 = Pause
383keycode 120 =
384keycode 121 =
385keycode 122 =
386keycode 123 =
387keycode 124 =
388keycode 125 =
389keycode 126 =
390keycode 127 =
391string F1 = "\033[[A"
392string F2 = "\033[[B"
393string F3 = "\033[[C"
diff --git a/openembedded/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map
new file mode 100644
index 0000000000..285b597c99
--- /dev/null
+++ b/openembedded/packages/initscripts/initscripts-1.0/poodle/keymap-2.6.map
@@ -0,0 +1,393 @@
1# Default kernel keymap. This uses 7 modifier combinations.
2keymaps 0-2,4-5,8,12
3# Change the above line into
4# keymaps 0-2,4-6,8,12
5# in case you want the entries
6# altgr control keycode 83 = Boot
7# altgr control keycode 111 = Boot
8# below.
9#
10# In fact AltGr is used very little, and one more keymap can
11# be saved by mapping AltGr to Alt (and adapting a few entries):
12# keycode 100 = Alt
13#
14# Note:
15# The way in which the modifiers are handled are quite different
16# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
17#
18# Here, we simply pass up Fn as Control, and the german accent key
19# as Altgr, and simply use a proper keymap. Said keymap is as
20# follows.
21# keymaps 0-2,4-5,8,12,20
22keycode 1 = Escape Escape
23 alt keycode 1 = Meta_Escape
24keycode 2 = one exclam
25 alt keycode 2 = Meta_one
26keycode 3 = two at at
27 control keycode 3 = nul
28 shift control keycode 3 = nul
29 alt keycode 3 = Meta_two
30keycode 4 = three numbersign
31 control keycode 4 = Escape
32 alt keycode 4 = Meta_three
33keycode 5 = four dollar dollar
34 control keycode 5 = Control_backslash
35 alt keycode 5 = Meta_four
36keycode 6 = five percent
37 control keycode 6 = Control_bracketright
38 alt keycode 6 = Meta_five
39keycode 7 = six asciicircum
40 control keycode 7 = Control_asciicircum
41 alt keycode 7 = Meta_six
42keycode 8 = seven ampersand braceleft
43 control keycode 8 = Control_underscore
44 alt keycode 8 = Meta_seven
45keycode 9 = eight asterisk bracketleft
46 control keycode 9 = Delete
47 alt keycode 9 = Meta_eight
48keycode 10 = nine parenleft bracketright
49 alt keycode 10 = Meta_nine
50keycode 11 = zero parenright braceright
51 alt keycode 11 = Meta_zero
52keycode 12 = minus underscore backslash
53 control keycode 12 = Control_underscore
54 shift control keycode 12 = Control_underscore
55 alt keycode 12 = Meta_minus
56keycode 13 = equal plus
57 alt keycode 13 = Meta_equal
58keycode 14 = Delete Delete
59 control keycode 14 = BackSpace
60 alt keycode 14 = Meta_Delete
61keycode 14 = BackSpace
62 shift keycode 14 = BackSpace
63 control keycode 14 = Delete
64 shiftl control keycode 14 = bracketleft
65 control shiftr keycode 14 = bracketleft
66keycode 15 = Tab Tab
67 alt keycode 15 = Meta_Tab
68 shift keycode 15 = backslash
69 control keycode 15 = Caps_Lock
70 shiftl control keycode 15 = Caps_Lock
71 control shiftr keycode 15 = Caps_Lock
72keycode 16 = q
73 control keycode 16 = one
74 shiftl control keycode 16 = Control_q
75 control shiftr keycode 16 = Meta_q
76keycode 17 = w
77keycode 18 = e
78 altgr keycode 18 = Hex_E
79 control keycode 17 = two
80 shiftl control keycode 17 = Control_w
81 control shiftr keycode 17 = Meta_w
82keycode 18 = e
83 control keycode 18 = three
84 shiftl control keycode 18 = Control_e
85 control shiftr keycode 18 = Meta_e
86keycode 19 = r
87 control keycode 19 = four
88 shiftr control keycode 19 = Control_r
89 control shiftl keycode 19 = Meta_r
90keycode 20 = t
91 control keycode 20 = five
92 shiftl control keycode 20 = Control_t
93 control shiftr keycode 20 = Meta_t
94keycode 21 = y
95 control keycode 21 = six
96 shiftl control keycode 21 = Control_y
97 control shiftr keycode 21 = Meta_y
98keycode 22 = u
99 control keycode 22 = seven
100 shiftl control keycode 22 = Control_u
101 control shiftr keycode 22 = Meta_u
102keycode 23 = i
103 control keycode 23 = eight
104 shiftl control keycode 23 = Control_i
105 control shiftr keycode 23 = Meta_i
106keycode 24 = o
107 control keycode 24 = nine
108 shiftl control keycode 24 = Control_o
109 control shiftr keycode 24 = Meta_o
110keycode 25 = p
111keycode 26 = bracketleft braceleft
112 control keycode 26 = Escape
113 alt keycode 26 = Meta_bracketleft
114keycode 27 = bracketright braceright asciitilde
115 control keycode 27 = Control_bracketright
116 alt keycode 27 = Meta_bracketright
117 control keycode 25 = zero
118 shiftl control keycode 25 = Control_p
119 control shiftr keycode 25 = Meta_p
120keycode 28 = Return
121 alt keycode 28 = Meta_Control_m
122 control keycode 28 = greater
123 shiftl control keycode 28 = braceright
124 control shiftr keycode 28 = braceright
125keycode 29 = Control
126keycode 30 = a
127 altgr keycode 30 = Hex_A
128keycode 30 = a
129 control keycode 30 = exclam
130 shiftl control keycode 30 = Control_a
131 control shiftr keycode 30 = Meta_a
132keycode 31 = s
133keycode 32 = d
134 altgr keycode 32 = Hex_D
135keycode 33 = f
136 altgr keycode 33 = Hex_F
137 control keycode 31 = at
138 shiftl control keycode 31 = Control_s
139 control shiftr keycode 31 = Meta_s
140keycode 32 = d
141 control keycode 32 = numbersign
142 shiftl control keycode 32 = Control_d
143 control shiftr keycode 32 = Meta_d
144keycode 33 = f
145 control keycode 33 = dollar
146 shiftl control keycode 33 = Control_f
147 control shiftr keycode 33 = Meta_f
148keycode 34 = g
149 control keycode 34 = percent
150 shiftl control keycode 34 = Control_g
151 control shiftr keycode 34 = Meta_g
152keycode 35 = h
153 control keycode 35 = underscore
154 shiftl control keycode 35 = BackSpace
155 control shiftr keycode 35 = BackSpace
156keycode 36 = j
157 control keycode 36 = ampersand
158 shiftl control keycode 36 = Linefeed
159 control shiftr keycode 36 = Linefeed
160keycode 37 = k
161 control keycode 37 = asterisk
162 shiftl control keycode 37 = Control_k
163 control shiftr keycode 37 = Meta_k
164keycode 38 = l
165keycode 39 = semicolon colon
166 alt keycode 39 = Meta_semicolon
167keycode 40 = apostrophe quotedbl
168 control keycode 40 = Control_g
169 alt keycode 40 = Meta_apostrophe
170keycode 41 = grave asciitilde
171 control keycode 41 = nul
172 alt keycode 41 = Meta_grave
173 control keycode 38 = parenleft
174 shiftl control keycode 38 = Control_l
175 control shiftr keycode 38 = Meta_l
176keycode 40 = apostrophe quotedbl
177 control keycode 40 = asciitilde
178 shiftl control keycode 40 = asciicircum
179 control shiftr keycode 40 = asciicircum
180keycode 42 = Shift
181keycode 43 = backslash bar
182 control keycode 43 = Control_backslash
183 alt keycode 43 = Meta_backslash
184keycode 44 = z
185 control keycode 44 = Control_z
186 shiftl control keycode 44 = Control_z
187 control shiftr keycode 44 = Meta_z
188keycode 45 = x
189keycode 46 = c
190 altgr keycode 46 = Hex_C
191 control keycode 45 = Control_x
192 shiftl control keycode 45 = Control_x
193 control shiftr keycode 45 = Meta_x
194keycode 46 = c
195 control keycode 46 = Control_c
196 shiftl control keycode 46 = Control_c
197 control shiftr keycode 46 = Meta_c
198keycode 47 = v
199keycode 48 = b
200 altgr keycode 48 = Hex_B
201 control keycode 47 = Control_v
202 shiftl control keycode 47 = Control_v
203 control shiftr keycode 47 = Meta_v
204## current location ##
205keycode 48 = b
206 control keycode 48 = minus
207 shiftl control keycode 48 = Control_b
208 control shiftr keycode 48 = Meta_b
209keycode 49 = n
210 control keycode 49 = plus
211 shiftl control keycode 49 = Control_n
212 control shiftr keycode 49 = Meta_n
213keycode 50 = m
214keycode 51 = comma less
215 alt keycode 51 = Meta_comma
216keycode 52 = period greater
217 control keycode 52 = Compose
218 alt keycode 52 = Meta_period
219keycode 53 = slash question
220 control keycode 53 = Delete
221 alt keycode 53 = Meta_slash
222 control keycode 50 = equal
223 shiftl control keycode 50 = Control_m
224 control shiftr keycode 50 = Meta_m
225keycode 51 = comma
226 shift keycode 51 = semicolon
227 control keycode 51 = parenright
228 shiftl control keycode 51 = bracketright
229 control shiftr keycode 51 = bracketright
230keycode 52 = period
231 shift keycode 52 = colon
232 control keycode 52 = less
233 shiftl control keycode 52 = braceleft
234 control shiftr keycode 52 = braceleft
235keycode 53 = slash
236 shift keycode 53 = question
237 control keycode 53 = Num_Lock
238 shiftl control keycode 53 = Num_Lock
239 control shiftr keycode 53 = Num_Lock
240keycode 54 = Shift
241keycode 55 = KP_Multiply
242keycode 56 = Alt
243keycode 57 = space space
244 control keycode 57 = nul
245 alt keycode 57 = Meta_space
246keycode 58 = Caps_Lock
247keycode 59 = F1 F11 Console_13
248 control keycode 59 = F1
249 alt keycode 59 = Console_1
250 control alt keycode 59 = Console_1
251keycode 60 = F2 F12 Console_14
252 control keycode 60 = F2
253 alt keycode 60 = Console_2
254 control alt keycode 60 = Console_2
255keycode 61 = F3 F13 Console_15
256 control keycode 61 = F3
257 alt keycode 61 = Console_3
258 control alt keycode 61 = Console_3
259keycode 62 = F4 F14 Console_16
260 control keycode 62 = F4
261 alt keycode 62 = Console_4
262 control alt keycode 62 = Console_4
263keycode 63 = F5 F15 Console_17
264 control keycode 63 = F5
265 alt keycode 63 = Console_5
266 control alt keycode 63 = Console_5
267keycode 64 = F6 F16 Console_18
268 control keycode 64 = F6
269 alt keycode 64 = Console_6
270 control alt keycode 64 = Console_6
271keycode 65 = F7 F17 Console_19
272 control keycode 65 = F7
273 alt keycode 65 = Console_7
274 control alt keycode 65 = Console_7
275keycode 66 = F8 F18 Console_20
276 control keycode 66 = F8
277 alt keycode 66 = Console_8
278 control alt keycode 66 = Console_8
279keycode 67 = F9 F19 Console_21
280 control keycode 67 = F9
281 alt keycode 67 = Console_9
282 control alt keycode 67 = Console_9
283keycode 68 = F10 F20 Console_22
284 control keycode 68 = F10
285 alt keycode 68 = Console_10
286 control alt keycode 68 = Console_10
287keycode 69 = Num_Lock
288 shift keycode 69 = Bare_Num_Lock
289keycode 70 = Scroll_Lock Show_Memory Show_Registers
290 control keycode 70 = Show_State
291 alt keycode 70 = Scroll_Lock
292keycode 71 = KP_7
293 alt keycode 71 = Ascii_7
294 altgr keycode 71 = Hex_7
295keycode 72 = KP_8
296 alt keycode 72 = Ascii_8
297 altgr keycode 72 = Hex_8
298keycode 73 = KP_9
299 alt keycode 73 = Ascii_9
300 altgr keycode 73 = Hex_9
301keycode 74 = KP_Subtract
302keycode 75 = KP_4
303 alt keycode 75 = Ascii_4
304 altgr keycode 75 = Hex_4
305keycode 76 = KP_5
306 alt keycode 76 = Ascii_5
307 altgr keycode 76 = Hex_5
308keycode 77 = KP_6
309 alt keycode 77 = Ascii_6
310 altgr keycode 77 = Hex_6
311keycode 78 = KP_Add
312keycode 79 = KP_1
313 alt keycode 79 = Ascii_1
314 altgr keycode 79 = Hex_1
315keycode 80 = KP_2
316 alt keycode 80 = Ascii_2
317 altgr keycode 80 = Hex_2
318keycode 81 = KP_3
319 alt keycode 81 = Ascii_3
320 altgr keycode 81 = Hex_3
321keycode 82 = KP_0
322 alt keycode 82 = Ascii_0
323 altgr keycode 82 = Hex_0
324keycode 83 = KP_Period
325# altgr control keycode 83 = Boot
326 control alt keycode 83 = Boot
327keycode 84 = Last_Console
328keycode 85 =
329keycode 86 = less greater bar
330 alt keycode 86 = Meta_less
331keycode 87 = F11 F11 Console_23
332 control keycode 87 = F11
333 alt keycode 87 = Console_11
334 control alt keycode 87 = Console_11
335keycode 88 = F12 F12 Console_24
336 control keycode 88 = F12
337 alt keycode 88 = Console_12
338 control alt keycode 88 = Console_12
339keycode 89 =
340keycode 90 =
341keycode 91 =
342keycode 92 =
343keycode 93 =
344keycode 94 =
345keycode 95 =
346keycode 96 = KP_Enter
347keycode 57 = space
348 shift keycode 57 = bar
349 control keycode 57 = nul
350 shiftl control keycode 57 = grave
351 control shiftr keycode 57 = grave
352keycode 97 = Control
353keycode 98 = KP_Divide
354keycode 99 = Control_backslash
355 control keycode 99 = Control_backslash
356 alt keycode 99 = Control_backslash
357keycode 100 = AltGr
358keycode 101 = Break
359keycode 102 = Find
360keycode 103 = Up
361keycode 104 = Prior
362 shift keycode 104 = Scroll_Backward
363keycode 105 = Left
364 alt keycode 105 = Decr_Console
365keycode 106 = Right
366 alt keycode 106 = Incr_Console
367keycode 107 = Select
368keycode 108 = Down
369keycode 109 = Next
370 shift keycode 109 = Scroll_Forward
371keycode 110 = Insert
372keycode 111 = Remove
373# altgr control keycode 111 = Boot
374 control alt keycode 111 = Boot
375keycode 112 = Macro
376keycode 113 = F13
377keycode 114 = F14
378keycode 115 = Help
379keycode 116 = Do
380keycode 117 = F17
381keycode 118 = KP_MinPlus
382keycode 119 = Pause
383keycode 120 =
384keycode 121 =
385keycode 122 =
386keycode 123 =
387keycode 124 =
388keycode 125 =
389keycode 126 =
390keycode 127 =
391string F1 = "\033[[A"
392string F2 = "\033[[B"
393string F3 = "\033[[C"
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.152.bb b/openembedded/packages/ipkg/ipkg-native_0.99.154.bb
index d59eab3a61..d59eab3a61 100644
--- a/openembedded/packages/ipkg/ipkg-native_0.99.152.bb
+++ b/openembedded/packages/ipkg/ipkg-native_0.99.154.bb
diff --git a/openembedded/packages/ipkg/ipkg_0.99.152.bb b/openembedded/packages/ipkg/ipkg_0.99.154.bb
index 1898c6656e..1898c6656e 100644
--- a/openembedded/packages/ipkg/ipkg_0.99.152.bb
+++ b/openembedded/packages/ipkg/ipkg_0.99.154.bb
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
index 28643b8142..3b374340cc 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
@@ -1,6 +1,6 @@
1include linux-openzaurus.inc 1include linux-openzaurus.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5# Handy URLs 5# Handy URLs
6# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ 6# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
27 ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \ 27 ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
28 ${RPSRC}/poodle_mmc-r0.patch;patch=1 \ 28 ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
29 ${RPSRC}/poodle_irda-r0.patch;patch=1 \ 29 ${RPSRC}/poodle_irda-r0.patch;patch=1 \
30 ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
30 ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \ 31 ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
31 ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ 32 ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
32 ${RPSRC}/corgi_pm-r3.patch;patch=1 \ 33 ${RPSRC}/corgi_pm-r3.patch;patch=1 \
@@ -62,7 +63,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
62 ${DOSRC}/tosa-irda-r3.patch;patch=1 \ 63 ${DOSRC}/tosa-irda-r3.patch;patch=1 \
63 ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ 64 ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
64 ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \ 65 ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \
65 ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ 66 ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
66 ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ 67 ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
67 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ 68 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
68 file://add-oz-release-string.patch;patch=1 \ 69 file://add-oz-release-string.patch;patch=1 \
diff --git a/openembedded/packages/maemo/nokia770-init_1.0.bb b/openembedded/packages/maemo/nokia770-init_1.0.bb
index 14ec4a0cfd..414c4e41c0 100644
--- a/openembedded/packages/maemo/nokia770-init_1.0.bb
+++ b/openembedded/packages/maemo/nokia770-init_1.0.bb
@@ -1,9 +1,9 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2MAINTAINER = "Florian Boor <florian@kernelconcepts.de" 2MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
3PR = "r3" 3PR = "r4"
4 4
5DEPENDS = "base-passwd" 5DEPENDS = "base-passwd"
6RDEPENDS = "hotplug" 6#RDEPENDS = "hotplug"
7 7
8SRC_URI = "file://fixup-770.sh" 8SRC_URI = "file://fixup-770.sh"
9 9
diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb b/openembedded/packages/module-init-tools/module-init-tools_3.1.bb
new file mode 100644
index 0000000000..62523f513a
--- /dev/null
+++ b/openembedded/packages/module-init-tools/module-init-tools_3.1.bb
@@ -0,0 +1,60 @@
1LICENSE = "GPL"
2SECTION = "base"
3DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
4removing kernel modules for Linux (versions 2.5.48 and above). It serves \
5the same function that the modutils package serves for Linux 2.4."
6PR = "r2"
7
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod"
10
11FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13
14SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory;patch=1 \
16 file://modutils_extension;patch=1 \
17 file://no_man_rebuild;patch=1 \
18 file://manpagesopt;patch=1 \
19 file://soc.patch;patch=1;pnum=0"
20S = "${WORKDIR}/module-init-tools-${PV}"
21
22EXTRA_OECONF = "--disable-manpages"
23
24bindir = "/bin"
25sbindir = "/sbin"
26
27inherit autotools
28
29do_install() {
30 autotools_do_install
31 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
32 mv ${D}/$f ${D}/$f.26
33 done
34}
35
36pkg_postinst_module-init-tools() {
37#!/bin/sh
38for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
39bn=`basename $f`
40 update-alternatives --install /$f $bn /$f.26 20
41done
42}
43
44pkg_prerm_module-init-tools() {
45#!/bin/sh
46for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
47bn=`basename $f`
48 update-alternatives --remove $bn /$f.26
49done
50}
51
52pkg_postinst_module-init-tools-depmod() {
53#!/bin/sh
54update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
55}
56
57pkg_prerm_module-init-tools() {
58#!/bin/sh
59update-alternatives --remove depmod /sbin/depmod.26
60}
diff --git a/openembedded/packages/pcmciautils/pcmciautils_010.bb b/openembedded/packages/pcmciautils/pcmciautils_010.bb
index f619a98235..8045a0e442 100644
--- a/openembedded/packages/pcmciautils/pcmciautils_010.bb
+++ b/openembedded/packages/pcmciautils/pcmciautils_010.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" 1DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
2DEPENDS = "sysfsutils udev" 2DEPENDS = "sysfsutils udev module-init-tools"
3RDEPENDS = "udev" 3RDEPENDS = "udev module-init-tools"
4HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" 4HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
5SECTION = "kernel/userland" 5SECTION = "kernel/userland"
6PRIORITY = "optional" 6PRIORITY = "optional"
@@ -8,15 +8,11 @@ PRIORITY = "optional"
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" 8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
9S = "${WORKDIR}/pcmciautils-${PV}" 9S = "${WORKDIR}/pcmciautils-${PV}"
10 10
11PR = "r1" 11PR = "r3"
12
13inherit update-rc.d
14
15INITSCRIPT_NAME = "coldplug"
16INITSCRIPT_PARAMS = "defaults"
17 12
18export HOSTCC = "${BUILD_CC}" 13export HOSTCC = "${BUILD_CC}"
19export etcdir = "${sysconfdir}" 14export etcdir = "${sysconfdir}"
15export sbindir = "${base_sbindir}"
20export pcmciaconfdir = "${sysconfdir}/pcmcia" 16export pcmciaconfdir = "${sysconfdir}/pcmcia"
21export udevrulesdir = "${sysconfdir}/udev/rules.d" 17export udevrulesdir = "${sysconfdir}/udev/rules.d"
22export UDEV = 1 18export UDEV = 1
diff --git a/openembedded/packages/udev/files/devfs-udev.rules b/openembedded/packages/udev/files/devfs-udev.rules
new file mode 100644
index 0000000000..0ba1ad4e7f
--- /dev/null
+++ b/openembedded/packages/udev/files/devfs-udev.rules
@@ -0,0 +1,108 @@
1# The use of these rules is not recommended or supported.
2# In a world where devices can come and go at any time, the devfs scheme
3# of simple device enumeration does not help _anything_. Just forget about
4# it. Use custom rules to name your device or look at the persistent device
5# naming scheme, which is implemented for disks and add your subsystem.
6
7# ide block devices
8BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
9
10# md block devices
11KERNEL="md[0-9]*", NAME="md/%n"
12
13# floppy devices
14KERNEL="fd[0-9]*", NAME="floppy/%n"
15
16# tty devices
17KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
18KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
19KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
20
21# vc devices
22KERNEL="vcs", NAME="vcc/0"
23KERNEL="vcs[0-9]*", NAME="vcc/%n"
24KERNEL="vcsa", NAME="vcc/a0"
25KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
26
27# v4l devices
28KERNEL="video[0-9]*", NAME="v4l/video%n"
29KERNEL="radio[0-9]*", NAME="v4l/radio%n"
30KERNEL="vbi[0-9]*", NAME="v4l/vbi%n"
31KERNEL="vtx[0-9]*", NAME="v4l/vtx%n"
32
33# dm devices (ignore them)
34KERNEL="dm-[0-9]*", NAME=""
35
36# i2c devices
37KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
38
39# loop devices
40KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
41
42# ramdisks
43KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
44
45# framebuffer devices
46KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
47
48# misc
49KERNEL="rtc", NAME="misc/%k", SYMLINK="%k"
50KERNEL="psaux", NAME="misc/%k", SYMLINK="%k"
51KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
52KERNEL="rtc", NAME="misc/%k", SYMLINK="%k"
53KERNEL="psaux", NAME="misc/%k", SYMLINK="%k"
54KERNEL="uinput", NAME="misc/%k", SYMLINK="%k"
55
56# alsa devices
57KERNEL="controlC[0-9]*", NAME="snd/%k"
58KERNEL="hw[CD0-9]*", NAME="snd/%k"
59KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
60KERNEL="midi[CD0-9]*", NAME="snd/%k"
61KERNEL="timer", NAME="snd/%k"
62KERNEL="seq", NAME="snd/%k"
63
64# oss devices
65KERNEL="audio*", NAME="sound/%k", SYMLINK="%k"
66KERNEL="dmmidi", NAME="sound/%k", SYMLINK="%k"
67KERNEL="dsp*", NAME="sound/%k", SYMLINK="%k"
68KERNEL="midi*", NAME="sound/%k", SYMLINK="%k"
69KERNEL="mixer*", NAME="sound/%k", SYMLINK="%k"
70KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k"
71
72# input devices
73KERNEL="mice", NAME="input/%k"
74KERNEL="mouse*", NAME="input/%k"
75KERNEL="event*", NAME="input/%k"
76KERNEL="js*", NAME="input/%k"
77KERNEL="ts*", NAME="input/%k"
78
79# USB devices
80KERNEL="hiddev*", NAME="usb/%k"
81KERNEL="auer*", NAME="usb/%k"
82KERNEL="legousbtower*", NAME="usb/%k"
83KERNEL="dabusb*", NAME="usb/%k"
84BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
85
86# netlink devices
87KERNEL="route", NAME="netlink/%k"
88KERNEL="skip", NAME="netlink/%k"
89KERNEL="usersock", NAME="netlink/%k"
90KERNEL="fwmonitor", NAME="netlink/%k"
91KERNEL="tcpdiag", NAME="netlink/%k"
92KERNEL="nflog", NAME="netlink/%k"
93KERNEL="xfrm", NAME="netlink/%k"
94KERNEL="arpd", NAME="netlink/%k"
95KERNEL="route6", NAME="netlink/%k"
96KERNEL="ip6_fw", NAME="netlink/%k"
97KERNEL="dnrtmsg", NAME="netlink/%k"
98KERNEL="tap*", NAME="netlink/%k"
99
100# CAPI devices
101KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
102KERNEL="capi*", NAME="capi/%n"
103
104# Network devices
105KERNEL="tun", NAME="net/%k"
106
107# raw devices
108KERNEL="raw[0-9]*", NAME="raw/%k"
diff --git a/openembedded/packages/udev/udev.inc b/openembedded/packages/udev/udev.inc
index 9ab17e87f4..2387d07945 100644
--- a/openembedded/packages/udev/udev.inc
+++ b/openembedded/packages/udev/udev.inc
@@ -4,6 +4,7 @@ LICENSE = "GPL"
4 4
5SRC_URI += " \ 5SRC_URI += " \
6 file://udev.rules \ 6 file://udev.rules \
7 file://devfs-udev.rules \
7 file://links.conf \ 8 file://links.conf \
8 file://permissions.rules \ 9 file://permissions.rules \
9 file://mount.sh \ 10 file://mount.sh \
@@ -49,7 +50,7 @@ do_install () {
49 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 50 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
50 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 51 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
51 if [ "${UDEV_DEVFS_RULES}" = "1" ]; then 52 if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
52 install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules 53 install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
53 fi 54 fi
54 55
55 install -d ${D}${sysconfdir}/udev/scripts/ 56 install -d ${D}${sysconfdir}/udev/scripts/
diff --git a/openembedded/packages/udev/udev_070.bb b/openembedded/packages/udev/udev_070.bb
index 8b4181b363..dfc20eb5b4 100644
--- a/openembedded/packages/udev/udev_070.bb
+++ b/openembedded/packages/udev/udev_070.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
6 6
7include udev.inc 7include udev.inc
8 8
9PR = "r2" 9PR = "r3"
10 10
11UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" 11UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
12 12
diff --git a/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch
new file mode 100644
index 0000000000..f43d38065e
--- /dev/null
+++ b/openembedded/packages/x11/files/errordb-keysymdb-path-fix.patch
@@ -0,0 +1,22 @@
1--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200
2+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200
3@@ -56,7 +56,7 @@
4 #include <stdio.h>
5
6 #ifndef ERRORDB
7-#define ERRORDB "/usr/lib/X11/XErrorDB"
8+#define ERRORDB "/usr/share/X11/XErrorDB"
9 #endif
10
11 /*
12--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200
13+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
14@@ -36,7 +36,7 @@
15 #include "Key.h"
16
17 #ifndef KEYSYMDB
18-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
19+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
20 #endif
21
22 static Bool initialized;
diff --git a/openembedded/packages/x11/x11_6.2.1.bb b/openembedded/packages/x11/x11_6.2.1.bb
index d3a6941b9a..121c1ddd9e 100644
--- a/openembedded/packages/x11/x11_6.2.1.bb
+++ b/openembedded/packages/x11/x11_6.2.1.bb
@@ -7,9 +7,10 @@ DESCRIPTION = "Base X libs."
7FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" 7FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
8FILES_${PN}-locale += "${datadir}/X11/locale" 8FILES_${PN}-locale += "${datadir}/X11/locale"
9PROVIDES = "x11" 9PROVIDES = "x11"
10PR = "r2" 10PR = "r3"
11 11
12SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ 12SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
13 file://errordb-keysymdb-path-fix.patch;patch=1 \
13 file://autofoo.patch;patch=1" 14 file://autofoo.patch;patch=1"
14S = "${WORKDIR}/libX11-${PV}" 15S = "${WORKDIR}/libX11-${PV}"
15 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-06 10:55:02 +0000