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
This commit is contained in:
Richard Purdie
parent
d18457f094
commit
26a96fc12f
|
|
@ -1,2 +1,3 @@
|
|||
TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
|
||||
#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
|
||||
TARGET_CC_ARCH = "-march=armv5te"
|
||||
PACKAGE_ARCH = "armv5te"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
#! /bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Debian init.d script for D-BUS
|
||||
# Copyright © 2003 Colin Walters <walters@debian.org>
|
||||
|
||||
set -e
|
||||
|
||||
DAEMON=/usr/bin/dbus-daemon
|
||||
NAME=dbus-1
|
||||
DAEMONUSER=messagebus
|
||||
PIDDIR=/var/run/dbus
|
||||
PIDFILE=$PIDDIR/pid
|
||||
DESC="system message bus"
|
||||
EVENTDIR=/etc/dbus-1/event.d
|
||||
|
||||
test -x $DAEMON || exit 0
|
||||
|
||||
# Source defaults file; edit that file to configure this script.
|
||||
ENABLED=1
|
||||
PARAMS=""
|
||||
if [ -e /etc/default/dbus-1 ]; then
|
||||
. /etc/default/dbus-1
|
||||
fi
|
||||
|
||||
test "$ENABLED" != "0" || exit 0
|
||||
|
||||
start_it_up()
|
||||
{
|
||||
if [ ! -d $PIDDIR ]; then
|
||||
mkdir -p $PIDDIR
|
||||
chown $DAEMONUSER $PIDDIR
|
||||
chgrp $DAEMONUSER $PIDDIR
|
||||
fi
|
||||
if [ -e $PIDFILE ]; then
|
||||
PIDDIR=/proc/$(cat $PIDFILE)
|
||||
if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
|
||||
echo "$DESC already started; not starting."
|
||||
else
|
||||
echo "Removing stale PID file $PIDFILE."
|
||||
rm -f $PIDFILE
|
||||
fi
|
||||
fi
|
||||
echo -n "Starting $DESC: "
|
||||
start-stop-daemon --start --quiet --pidfile $PIDFILE \
|
||||
--user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
|
||||
echo "$NAME."
|
||||
if [ -d $EVENTDIR ]; then
|
||||
run-parts --arg=start $EVENTDIR
|
||||
fi
|
||||
}
|
||||
|
||||
shut_it_down()
|
||||
{
|
||||
if [ -d $EVENTDIR ]; then
|
||||
run-parts --reverse --arg=stop $EVENTDIR
|
||||
fi
|
||||
echo -n "Stopping $DESC: "
|
||||
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
|
||||
--user $DAEMONUSER
|
||||
# We no longer include these arguments so that start-stop-daemon
|
||||
# can do its job even given that we may have been upgraded.
|
||||
# We rely on the pidfile being sanely managed
|
||||
# --exec $DAEMON -- --system $PARAMS
|
||||
echo "$NAME."
|
||||
rm -f $PIDFILE
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start_it_up
|
||||
;;
|
||||
stop)
|
||||
shut_it_down
|
||||
;;
|
||||
restart|force-reload)
|
||||
shut_it_down
|
||||
sleep 1
|
||||
start_it_up
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:05:38 +0200
|
||||
+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:06:30 +0200
|
||||
@@ -6,9 +6,6 @@
|
||||
nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
|
||||
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
|
||||
|
||||
-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
|
||||
- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
|
||||
-
|
||||
BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
|
||||
|
||||
else
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:03:49 +0200
|
||||
+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:04:28 +0200
|
||||
@@ -21,11 +21,6 @@
|
||||
GTK_TOOLS=
|
||||
endif
|
||||
|
||||
-if HAVE_GLIB
|
||||
-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
|
||||
- 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
|
||||
-endif
|
||||
-
|
||||
bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
|
||||
|
||||
dbus_send_SOURCES= \
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
include dbus_${PV}.inc
|
||||
|
||||
SRC_URI_EXTRA=""
|
||||
|
||||
inherit native
|
||||
|
||||
S = "${WORKDIR}/dbus-${PV}"
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
|
||||
DEPENDS = "glib-2.0-native"
|
||||
|
||||
do_stage() {
|
||||
install -d ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
--- dbus-0.36.2/glib/Makefile.am.orig 2005-09-06 17:30:26 +0200
|
||||
+++ dbus-0.36.2/glib/Makefile.am 2005-09-06 17:30:34 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS = . examples
|
||||
+SUBDIRS = .
|
||||
|
||||
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
|
||||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
include dbus_${PV}.inc
|
||||
|
||||
|
||||
DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
|
||||
|
||||
FILES_${PN} += "${bindir}/dbus-daemon"
|
||||
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
|
||||
|
||||
do_configure_prepend() {
|
||||
install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
|
||||
install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
|
||||
}
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
SECTION = "base"
|
||||
PR = "r0"
|
||||
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
|
||||
DESCRIPTION = "message bus system for applications to talk to one another"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "expat glib-2.0 virtual/libintl"
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
|
||||
file://cross.patch;patch=1 \
|
||||
file://tmpdir.patch;patch=1 \
|
||||
file://dbus-1.init \
|
||||
file://no-examples.patch;patch=1 \
|
||||
${SRC_URI_EXTRA}"
|
||||
|
||||
inherit autotools pkgconfig update-rc.d gettext
|
||||
|
||||
INITSCRIPT_NAME = "dbus-1"
|
||||
INITSCRIPT_PARAMS = "defaults"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
|
||||
|
||||
FILES_${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.*"
|
||||
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
|
||||
|
||||
pkg_postinst_dbus() {
|
||||
#!/bin/sh
|
||||
|
||||
# can't do adduser stuff offline
|
||||
if [ "x$D" != "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MESSAGEUSER=messagebus
|
||||
MESSAGEHOME=/var/run/dbus
|
||||
|
||||
mkdir -p $MESSAGEHOME || true
|
||||
chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
|
||||
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
|
||||
}
|
||||
|
||||
EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
|
||||
--disable-checks --disable-xml-docs --disable-doxygen-docs \
|
||||
--with-xml=expat --without-x"
|
||||
|
||||
|
||||
do_stage () {
|
||||
oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
|
||||
oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
|
||||
|
||||
autotools_stage_includes
|
||||
|
||||
mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
|
||||
install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
|
||||
}
|
||||
|
||||
do_install_append () {
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
|
||||
}
|
||||
|
||||
python populate_packages_prepend () {
|
||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
||||
bb.data.setVar('PKG_dbus', 'dbus-1', d)
|
||||
}
|
||||
|
|
@ -4,9 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication."
|
|||
LICENSE = "GPL"
|
||||
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
|
||||
PROVIDES = "gconf"
|
||||
RPROVIDES = "gconf"
|
||||
RPROVIDES_${PN} = "gconf"
|
||||
RPROVIDES_${PN}-dev = "gconf-dev"
|
||||
|
||||
PV = "0.0cvs${CVSDATE}"
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
|
||||
file://gconf-dbus-update.patch;patch=1;pnum=0 \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,393 @@
|
|||
# Default kernel keymap. This uses 7 modifier combinations.
|
||||
keymaps 0-2,4-5,8,12
|
||||
# Change the above line into
|
||||
# keymaps 0-2,4-6,8,12
|
||||
# in case you want the entries
|
||||
# altgr control keycode 83 = Boot
|
||||
# altgr control keycode 111 = Boot
|
||||
# below.
|
||||
#
|
||||
# In fact AltGr is used very little, and one more keymap can
|
||||
# be saved by mapping AltGr to Alt (and adapting a few entries):
|
||||
# keycode 100 = Alt
|
||||
#
|
||||
# Note:
|
||||
# The way in which the modifiers are handled are quite different
|
||||
# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
|
||||
#
|
||||
# Here, we simply pass up Fn as Control, and the german accent key
|
||||
# as Altgr, and simply use a proper keymap. Said keymap is as
|
||||
# follows.
|
||||
# keymaps 0-2,4-5,8,12,20
|
||||
keycode 1 = Escape Escape
|
||||
alt keycode 1 = Meta_Escape
|
||||
keycode 2 = one exclam
|
||||
alt keycode 2 = Meta_one
|
||||
keycode 3 = two at at
|
||||
control keycode 3 = nul
|
||||
shift control keycode 3 = nul
|
||||
alt keycode 3 = Meta_two
|
||||
keycode 4 = three numbersign
|
||||
control keycode 4 = Escape
|
||||
alt keycode 4 = Meta_three
|
||||
keycode 5 = four dollar dollar
|
||||
control keycode 5 = Control_backslash
|
||||
alt keycode 5 = Meta_four
|
||||
keycode 6 = five percent
|
||||
control keycode 6 = Control_bracketright
|
||||
alt keycode 6 = Meta_five
|
||||
keycode 7 = six asciicircum
|
||||
control keycode 7 = Control_asciicircum
|
||||
alt keycode 7 = Meta_six
|
||||
keycode 8 = seven ampersand braceleft
|
||||
control keycode 8 = Control_underscore
|
||||
alt keycode 8 = Meta_seven
|
||||
keycode 9 = eight asterisk bracketleft
|
||||
control keycode 9 = Delete
|
||||
alt keycode 9 = Meta_eight
|
||||
keycode 10 = nine parenleft bracketright
|
||||
alt keycode 10 = Meta_nine
|
||||
keycode 11 = zero parenright braceright
|
||||
alt keycode 11 = Meta_zero
|
||||
keycode 12 = minus underscore backslash
|
||||
control keycode 12 = Control_underscore
|
||||
shift control keycode 12 = Control_underscore
|
||||
alt keycode 12 = 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 14 = BackSpace
|
||||
shift keycode 14 = BackSpace
|
||||
control keycode 14 = Delete
|
||||
shiftl control keycode 14 = bracketleft
|
||||
control shiftr keycode 14 = bracketleft
|
||||
keycode 15 = Tab Tab
|
||||
alt keycode 15 = Meta_Tab
|
||||
shift keycode 15 = backslash
|
||||
control keycode 15 = Caps_Lock
|
||||
shiftl control keycode 15 = Caps_Lock
|
||||
control shiftr keycode 15 = Caps_Lock
|
||||
keycode 16 = q
|
||||
control keycode 16 = one
|
||||
shiftl control keycode 16 = Control_q
|
||||
control shiftr keycode 16 = Meta_q
|
||||
keycode 17 = w
|
||||
keycode 18 = e
|
||||
altgr keycode 18 = Hex_E
|
||||
control keycode 17 = two
|
||||
shiftl control keycode 17 = Control_w
|
||||
control shiftr keycode 17 = Meta_w
|
||||
keycode 18 = e
|
||||
control keycode 18 = three
|
||||
shiftl control keycode 18 = Control_e
|
||||
control shiftr keycode 18 = Meta_e
|
||||
keycode 19 = r
|
||||
control keycode 19 = four
|
||||
shiftr control keycode 19 = Control_r
|
||||
control shiftl keycode 19 = Meta_r
|
||||
keycode 20 = t
|
||||
control keycode 20 = five
|
||||
shiftl control keycode 20 = Control_t
|
||||
control shiftr keycode 20 = Meta_t
|
||||
keycode 21 = y
|
||||
control keycode 21 = six
|
||||
shiftl control keycode 21 = Control_y
|
||||
control shiftr keycode 21 = Meta_y
|
||||
keycode 22 = u
|
||||
control keycode 22 = seven
|
||||
shiftl control keycode 22 = Control_u
|
||||
control shiftr keycode 22 = Meta_u
|
||||
keycode 23 = i
|
||||
control keycode 23 = eight
|
||||
shiftl control keycode 23 = Control_i
|
||||
control shiftr keycode 23 = Meta_i
|
||||
keycode 24 = o
|
||||
control keycode 24 = nine
|
||||
shiftl control keycode 24 = Control_o
|
||||
control shiftr keycode 24 = Meta_o
|
||||
keycode 25 = p
|
||||
keycode 26 = bracketleft braceleft
|
||||
control keycode 26 = Escape
|
||||
alt keycode 26 = Meta_bracketleft
|
||||
keycode 27 = bracketright braceright asciitilde
|
||||
control keycode 27 = Control_bracketright
|
||||
alt keycode 27 = Meta_bracketright
|
||||
control keycode 25 = zero
|
||||
shiftl control keycode 25 = Control_p
|
||||
control shiftr keycode 25 = Meta_p
|
||||
keycode 28 = Return
|
||||
alt keycode 28 = Meta_Control_m
|
||||
control keycode 28 = greater
|
||||
shiftl control keycode 28 = braceright
|
||||
control shiftr keycode 28 = braceright
|
||||
keycode 29 = Control
|
||||
keycode 30 = a
|
||||
altgr keycode 30 = Hex_A
|
||||
keycode 30 = a
|
||||
control keycode 30 = exclam
|
||||
shiftl control keycode 30 = Control_a
|
||||
control shiftr keycode 30 = Meta_a
|
||||
keycode 31 = s
|
||||
keycode 32 = d
|
||||
altgr keycode 32 = Hex_D
|
||||
keycode 33 = f
|
||||
altgr keycode 33 = Hex_F
|
||||
control keycode 31 = at
|
||||
shiftl control keycode 31 = Control_s
|
||||
control shiftr keycode 31 = Meta_s
|
||||
keycode 32 = d
|
||||
control keycode 32 = numbersign
|
||||
shiftl control keycode 32 = Control_d
|
||||
control shiftr keycode 32 = Meta_d
|
||||
keycode 33 = f
|
||||
control keycode 33 = dollar
|
||||
shiftl control keycode 33 = Control_f
|
||||
control shiftr keycode 33 = Meta_f
|
||||
keycode 34 = g
|
||||
control keycode 34 = percent
|
||||
shiftl control keycode 34 = Control_g
|
||||
control shiftr keycode 34 = Meta_g
|
||||
keycode 35 = h
|
||||
control keycode 35 = underscore
|
||||
shiftl control keycode 35 = BackSpace
|
||||
control shiftr keycode 35 = BackSpace
|
||||
keycode 36 = j
|
||||
control keycode 36 = ampersand
|
||||
shiftl control keycode 36 = Linefeed
|
||||
control shiftr keycode 36 = Linefeed
|
||||
keycode 37 = k
|
||||
control keycode 37 = asterisk
|
||||
shiftl control keycode 37 = Control_k
|
||||
control shiftr keycode 37 = Meta_k
|
||||
keycode 38 = l
|
||||
keycode 39 = semicolon colon
|
||||
alt keycode 39 = Meta_semicolon
|
||||
keycode 40 = apostrophe quotedbl
|
||||
control keycode 40 = Control_g
|
||||
alt keycode 40 = Meta_apostrophe
|
||||
keycode 41 = grave asciitilde
|
||||
control keycode 41 = nul
|
||||
alt keycode 41 = Meta_grave
|
||||
control keycode 38 = parenleft
|
||||
shiftl control keycode 38 = Control_l
|
||||
control shiftr keycode 38 = Meta_l
|
||||
keycode 40 = apostrophe quotedbl
|
||||
control keycode 40 = asciitilde
|
||||
shiftl control keycode 40 = asciicircum
|
||||
control shiftr keycode 40 = asciicircum
|
||||
keycode 42 = Shift
|
||||
keycode 43 = backslash bar
|
||||
control keycode 43 = Control_backslash
|
||||
alt keycode 43 = Meta_backslash
|
||||
keycode 44 = z
|
||||
control keycode 44 = Control_z
|
||||
shiftl control keycode 44 = Control_z
|
||||
control shiftr keycode 44 = Meta_z
|
||||
keycode 45 = x
|
||||
keycode 46 = c
|
||||
altgr keycode 46 = Hex_C
|
||||
control keycode 45 = Control_x
|
||||
shiftl control keycode 45 = Control_x
|
||||
control shiftr keycode 45 = Meta_x
|
||||
keycode 46 = c
|
||||
control keycode 46 = Control_c
|
||||
shiftl control keycode 46 = Control_c
|
||||
control shiftr keycode 46 = Meta_c
|
||||
keycode 47 = v
|
||||
keycode 48 = b
|
||||
altgr keycode 48 = Hex_B
|
||||
control keycode 47 = Control_v
|
||||
shiftl control keycode 47 = Control_v
|
||||
control shiftr keycode 47 = Meta_v
|
||||
## current location ##
|
||||
keycode 48 = b
|
||||
control keycode 48 = minus
|
||||
shiftl control keycode 48 = Control_b
|
||||
control shiftr keycode 48 = Meta_b
|
||||
keycode 49 = n
|
||||
control keycode 49 = plus
|
||||
shiftl control keycode 49 = Control_n
|
||||
control shiftr keycode 49 = Meta_n
|
||||
keycode 50 = m
|
||||
keycode 51 = comma less
|
||||
alt keycode 51 = Meta_comma
|
||||
keycode 52 = period greater
|
||||
control keycode 52 = Compose
|
||||
alt keycode 52 = Meta_period
|
||||
keycode 53 = slash question
|
||||
control keycode 53 = Delete
|
||||
alt keycode 53 = Meta_slash
|
||||
control keycode 50 = equal
|
||||
shiftl control keycode 50 = Control_m
|
||||
control shiftr keycode 50 = Meta_m
|
||||
keycode 51 = comma
|
||||
shift keycode 51 = semicolon
|
||||
control keycode 51 = parenright
|
||||
shiftl control keycode 51 = bracketright
|
||||
control shiftr keycode 51 = bracketright
|
||||
keycode 52 = period
|
||||
shift keycode 52 = colon
|
||||
control keycode 52 = less
|
||||
shiftl control keycode 52 = braceleft
|
||||
control shiftr keycode 52 = braceleft
|
||||
keycode 53 = slash
|
||||
shift keycode 53 = question
|
||||
control keycode 53 = Num_Lock
|
||||
shiftl control keycode 53 = Num_Lock
|
||||
control shiftr keycode 53 = Num_Lock
|
||||
keycode 54 = Shift
|
||||
keycode 55 = KP_Multiply
|
||||
keycode 56 = Alt
|
||||
keycode 57 = space space
|
||||
control keycode 57 = nul
|
||||
alt keycode 57 = Meta_space
|
||||
keycode 58 = Caps_Lock
|
||||
keycode 59 = F1 F11 Console_13
|
||||
control keycode 59 = F1
|
||||
alt keycode 59 = Console_1
|
||||
control alt keycode 59 = Console_1
|
||||
keycode 60 = F2 F12 Console_14
|
||||
control keycode 60 = F2
|
||||
alt keycode 60 = Console_2
|
||||
control alt keycode 60 = Console_2
|
||||
keycode 61 = F3 F13 Console_15
|
||||
control keycode 61 = F3
|
||||
alt keycode 61 = Console_3
|
||||
control alt keycode 61 = Console_3
|
||||
keycode 62 = F4 F14 Console_16
|
||||
control keycode 62 = F4
|
||||
alt keycode 62 = Console_4
|
||||
control alt keycode 62 = Console_4
|
||||
keycode 63 = F5 F15 Console_17
|
||||
control keycode 63 = F5
|
||||
alt keycode 63 = Console_5
|
||||
control alt keycode 63 = Console_5
|
||||
keycode 64 = F6 F16 Console_18
|
||||
control keycode 64 = F6
|
||||
alt keycode 64 = Console_6
|
||||
control alt keycode 64 = Console_6
|
||||
keycode 65 = F7 F17 Console_19
|
||||
control keycode 65 = F7
|
||||
alt keycode 65 = Console_7
|
||||
control alt keycode 65 = Console_7
|
||||
keycode 66 = F8 F18 Console_20
|
||||
control keycode 66 = F8
|
||||
alt keycode 66 = Console_8
|
||||
control alt keycode 66 = Console_8
|
||||
keycode 67 = F9 F19 Console_21
|
||||
control keycode 67 = F9
|
||||
alt keycode 67 = Console_9
|
||||
control alt keycode 67 = Console_9
|
||||
keycode 68 = F10 F20 Console_22
|
||||
control keycode 68 = F10
|
||||
alt keycode 68 = Console_10
|
||||
control alt keycode 68 = Console_10
|
||||
keycode 69 = Num_Lock
|
||||
shift keycode 69 = Bare_Num_Lock
|
||||
keycode 70 = Scroll_Lock Show_Memory Show_Registers
|
||||
control keycode 70 = Show_State
|
||||
alt keycode 70 = Scroll_Lock
|
||||
keycode 71 = KP_7
|
||||
alt keycode 71 = Ascii_7
|
||||
altgr keycode 71 = Hex_7
|
||||
keycode 72 = KP_8
|
||||
alt keycode 72 = Ascii_8
|
||||
altgr keycode 72 = Hex_8
|
||||
keycode 73 = KP_9
|
||||
alt keycode 73 = Ascii_9
|
||||
altgr keycode 73 = Hex_9
|
||||
keycode 74 = KP_Subtract
|
||||
keycode 75 = KP_4
|
||||
alt keycode 75 = Ascii_4
|
||||
altgr keycode 75 = Hex_4
|
||||
keycode 76 = KP_5
|
||||
alt keycode 76 = Ascii_5
|
||||
altgr keycode 76 = Hex_5
|
||||
keycode 77 = KP_6
|
||||
alt keycode 77 = Ascii_6
|
||||
altgr keycode 77 = Hex_6
|
||||
keycode 78 = KP_Add
|
||||
keycode 79 = KP_1
|
||||
alt keycode 79 = Ascii_1
|
||||
altgr keycode 79 = Hex_1
|
||||
keycode 80 = KP_2
|
||||
alt keycode 80 = Ascii_2
|
||||
altgr keycode 80 = Hex_2
|
||||
keycode 81 = KP_3
|
||||
alt keycode 81 = Ascii_3
|
||||
altgr keycode 81 = Hex_3
|
||||
keycode 82 = KP_0
|
||||
alt keycode 82 = Ascii_0
|
||||
altgr keycode 82 = Hex_0
|
||||
keycode 83 = KP_Period
|
||||
# altgr control keycode 83 = Boot
|
||||
control alt keycode 83 = Boot
|
||||
keycode 84 = Last_Console
|
||||
keycode 85 =
|
||||
keycode 86 = less greater bar
|
||||
alt keycode 86 = Meta_less
|
||||
keycode 87 = F11 F11 Console_23
|
||||
control keycode 87 = F11
|
||||
alt keycode 87 = Console_11
|
||||
control alt keycode 87 = Console_11
|
||||
keycode 88 = F12 F12 Console_24
|
||||
control keycode 88 = F12
|
||||
alt keycode 88 = Console_12
|
||||
control alt keycode 88 = Console_12
|
||||
keycode 89 =
|
||||
keycode 90 =
|
||||
keycode 91 =
|
||||
keycode 92 =
|
||||
keycode 93 =
|
||||
keycode 94 =
|
||||
keycode 95 =
|
||||
keycode 96 = KP_Enter
|
||||
keycode 57 = space
|
||||
shift keycode 57 = bar
|
||||
control keycode 57 = nul
|
||||
shiftl control keycode 57 = grave
|
||||
control shiftr keycode 57 = grave
|
||||
keycode 97 = Control
|
||||
keycode 98 = KP_Divide
|
||||
keycode 99 = Control_backslash
|
||||
control keycode 99 = Control_backslash
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
shift keycode 104 = Scroll_Backward
|
||||
keycode 105 = Left
|
||||
alt keycode 105 = Decr_Console
|
||||
keycode 106 = Right
|
||||
alt keycode 106 = Incr_Console
|
||||
keycode 107 = Select
|
||||
keycode 108 = Down
|
||||
keycode 109 = Next
|
||||
shift keycode 109 = Scroll_Forward
|
||||
keycode 110 = Insert
|
||||
keycode 111 = Remove
|
||||
# altgr control keycode 111 = Boot
|
||||
control alt keycode 111 = Boot
|
||||
keycode 112 = Macro
|
||||
keycode 113 = F13
|
||||
keycode 114 = F14
|
||||
keycode 115 = Help
|
||||
keycode 116 = Do
|
||||
keycode 117 = F17
|
||||
keycode 118 = KP_MinPlus
|
||||
keycode 119 = Pause
|
||||
keycode 120 =
|
||||
keycode 121 =
|
||||
keycode 122 =
|
||||
keycode 123 =
|
||||
keycode 124 =
|
||||
keycode 125 =
|
||||
keycode 126 =
|
||||
keycode 127 =
|
||||
string F1 = "\033[[A"
|
||||
string F2 = "\033[[B"
|
||||
string F3 = "\033[[C"
|
||||
|
|
@ -0,0 +1,393 @@
|
|||
# Default kernel keymap. This uses 7 modifier combinations.
|
||||
keymaps 0-2,4-5,8,12
|
||||
# Change the above line into
|
||||
# keymaps 0-2,4-6,8,12
|
||||
# in case you want the entries
|
||||
# altgr control keycode 83 = Boot
|
||||
# altgr control keycode 111 = Boot
|
||||
# below.
|
||||
#
|
||||
# In fact AltGr is used very little, and one more keymap can
|
||||
# be saved by mapping AltGr to Alt (and adapting a few entries):
|
||||
# keycode 100 = Alt
|
||||
#
|
||||
# Note:
|
||||
# The way in which the modifiers are handled are quite different
|
||||
# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
|
||||
#
|
||||
# Here, we simply pass up Fn as Control, and the german accent key
|
||||
# as Altgr, and simply use a proper keymap. Said keymap is as
|
||||
# follows.
|
||||
# keymaps 0-2,4-5,8,12,20
|
||||
keycode 1 = Escape Escape
|
||||
alt keycode 1 = Meta_Escape
|
||||
keycode 2 = one exclam
|
||||
alt keycode 2 = Meta_one
|
||||
keycode 3 = two at at
|
||||
control keycode 3 = nul
|
||||
shift control keycode 3 = nul
|
||||
alt keycode 3 = Meta_two
|
||||
keycode 4 = three numbersign
|
||||
control keycode 4 = Escape
|
||||
alt keycode 4 = Meta_three
|
||||
keycode 5 = four dollar dollar
|
||||
control keycode 5 = Control_backslash
|
||||
alt keycode 5 = Meta_four
|
||||
keycode 6 = five percent
|
||||
control keycode 6 = Control_bracketright
|
||||
alt keycode 6 = Meta_five
|
||||
keycode 7 = six asciicircum
|
||||
control keycode 7 = Control_asciicircum
|
||||
alt keycode 7 = Meta_six
|
||||
keycode 8 = seven ampersand braceleft
|
||||
control keycode 8 = Control_underscore
|
||||
alt keycode 8 = Meta_seven
|
||||
keycode 9 = eight asterisk bracketleft
|
||||
control keycode 9 = Delete
|
||||
alt keycode 9 = Meta_eight
|
||||
keycode 10 = nine parenleft bracketright
|
||||
alt keycode 10 = Meta_nine
|
||||
keycode 11 = zero parenright braceright
|
||||
alt keycode 11 = Meta_zero
|
||||
keycode 12 = minus underscore backslash
|
||||
control keycode 12 = Control_underscore
|
||||
shift control keycode 12 = Control_underscore
|
||||
alt keycode 12 = 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 14 = BackSpace
|
||||
shift keycode 14 = BackSpace
|
||||
control keycode 14 = Delete
|
||||
shiftl control keycode 14 = bracketleft
|
||||
control shiftr keycode 14 = bracketleft
|
||||
keycode 15 = Tab Tab
|
||||
alt keycode 15 = Meta_Tab
|
||||
shift keycode 15 = backslash
|
||||
control keycode 15 = Caps_Lock
|
||||
shiftl control keycode 15 = Caps_Lock
|
||||
control shiftr keycode 15 = Caps_Lock
|
||||
keycode 16 = q
|
||||
control keycode 16 = one
|
||||
shiftl control keycode 16 = Control_q
|
||||
control shiftr keycode 16 = Meta_q
|
||||
keycode 17 = w
|
||||
keycode 18 = e
|
||||
altgr keycode 18 = Hex_E
|
||||
control keycode 17 = two
|
||||
shiftl control keycode 17 = Control_w
|
||||
control shiftr keycode 17 = Meta_w
|
||||
keycode 18 = e
|
||||
control keycode 18 = three
|
||||
shiftl control keycode 18 = Control_e
|
||||
control shiftr keycode 18 = Meta_e
|
||||
keycode 19 = r
|
||||
control keycode 19 = four
|
||||
shiftr control keycode 19 = Control_r
|
||||
control shiftl keycode 19 = Meta_r
|
||||
keycode 20 = t
|
||||
control keycode 20 = five
|
||||
shiftl control keycode 20 = Control_t
|
||||
control shiftr keycode 20 = Meta_t
|
||||
keycode 21 = y
|
||||
control keycode 21 = six
|
||||
shiftl control keycode 21 = Control_y
|
||||
control shiftr keycode 21 = Meta_y
|
||||
keycode 22 = u
|
||||
control keycode 22 = seven
|
||||
shiftl control keycode 22 = Control_u
|
||||
control shiftr keycode 22 = Meta_u
|
||||
keycode 23 = i
|
||||
control keycode 23 = eight
|
||||
shiftl control keycode 23 = Control_i
|
||||
control shiftr keycode 23 = Meta_i
|
||||
keycode 24 = o
|
||||
control keycode 24 = nine
|
||||
shiftl control keycode 24 = Control_o
|
||||
control shiftr keycode 24 = Meta_o
|
||||
keycode 25 = p
|
||||
keycode 26 = bracketleft braceleft
|
||||
control keycode 26 = Escape
|
||||
alt keycode 26 = Meta_bracketleft
|
||||
keycode 27 = bracketright braceright asciitilde
|
||||
control keycode 27 = Control_bracketright
|
||||
alt keycode 27 = Meta_bracketright
|
||||
control keycode 25 = zero
|
||||
shiftl control keycode 25 = Control_p
|
||||
control shiftr keycode 25 = Meta_p
|
||||
keycode 28 = Return
|
||||
alt keycode 28 = Meta_Control_m
|
||||
control keycode 28 = greater
|
||||
shiftl control keycode 28 = braceright
|
||||
control shiftr keycode 28 = braceright
|
||||
keycode 29 = Control
|
||||
keycode 30 = a
|
||||
altgr keycode 30 = Hex_A
|
||||
keycode 30 = a
|
||||
control keycode 30 = exclam
|
||||
shiftl control keycode 30 = Control_a
|
||||
control shiftr keycode 30 = Meta_a
|
||||
keycode 31 = s
|
||||
keycode 32 = d
|
||||
altgr keycode 32 = Hex_D
|
||||
keycode 33 = f
|
||||
altgr keycode 33 = Hex_F
|
||||
control keycode 31 = at
|
||||
shiftl control keycode 31 = Control_s
|
||||
control shiftr keycode 31 = Meta_s
|
||||
keycode 32 = d
|
||||
control keycode 32 = numbersign
|
||||
shiftl control keycode 32 = Control_d
|
||||
control shiftr keycode 32 = Meta_d
|
||||
keycode 33 = f
|
||||
control keycode 33 = dollar
|
||||
shiftl control keycode 33 = Control_f
|
||||
control shiftr keycode 33 = Meta_f
|
||||
keycode 34 = g
|
||||
control keycode 34 = percent
|
||||
shiftl control keycode 34 = Control_g
|
||||
control shiftr keycode 34 = Meta_g
|
||||
keycode 35 = h
|
||||
control keycode 35 = underscore
|
||||
shiftl control keycode 35 = BackSpace
|
||||
control shiftr keycode 35 = BackSpace
|
||||
keycode 36 = j
|
||||
control keycode 36 = ampersand
|
||||
shiftl control keycode 36 = Linefeed
|
||||
control shiftr keycode 36 = Linefeed
|
||||
keycode 37 = k
|
||||
control keycode 37 = asterisk
|
||||
shiftl control keycode 37 = Control_k
|
||||
control shiftr keycode 37 = Meta_k
|
||||
keycode 38 = l
|
||||
keycode 39 = semicolon colon
|
||||
alt keycode 39 = Meta_semicolon
|
||||
keycode 40 = apostrophe quotedbl
|
||||
control keycode 40 = Control_g
|
||||
alt keycode 40 = Meta_apostrophe
|
||||
keycode 41 = grave asciitilde
|
||||
control keycode 41 = nul
|
||||
alt keycode 41 = Meta_grave
|
||||
control keycode 38 = parenleft
|
||||
shiftl control keycode 38 = Control_l
|
||||
control shiftr keycode 38 = Meta_l
|
||||
keycode 40 = apostrophe quotedbl
|
||||
control keycode 40 = asciitilde
|
||||
shiftl control keycode 40 = asciicircum
|
||||
control shiftr keycode 40 = asciicircum
|
||||
keycode 42 = Shift
|
||||
keycode 43 = backslash bar
|
||||
control keycode 43 = Control_backslash
|
||||
alt keycode 43 = Meta_backslash
|
||||
keycode 44 = z
|
||||
control keycode 44 = Control_z
|
||||
shiftl control keycode 44 = Control_z
|
||||
control shiftr keycode 44 = Meta_z
|
||||
keycode 45 = x
|
||||
keycode 46 = c
|
||||
altgr keycode 46 = Hex_C
|
||||
control keycode 45 = Control_x
|
||||
shiftl control keycode 45 = Control_x
|
||||
control shiftr keycode 45 = Meta_x
|
||||
keycode 46 = c
|
||||
control keycode 46 = Control_c
|
||||
shiftl control keycode 46 = Control_c
|
||||
control shiftr keycode 46 = Meta_c
|
||||
keycode 47 = v
|
||||
keycode 48 = b
|
||||
altgr keycode 48 = Hex_B
|
||||
control keycode 47 = Control_v
|
||||
shiftl control keycode 47 = Control_v
|
||||
control shiftr keycode 47 = Meta_v
|
||||
## current location ##
|
||||
keycode 48 = b
|
||||
control keycode 48 = minus
|
||||
shiftl control keycode 48 = Control_b
|
||||
control shiftr keycode 48 = Meta_b
|
||||
keycode 49 = n
|
||||
control keycode 49 = plus
|
||||
shiftl control keycode 49 = Control_n
|
||||
control shiftr keycode 49 = Meta_n
|
||||
keycode 50 = m
|
||||
keycode 51 = comma less
|
||||
alt keycode 51 = Meta_comma
|
||||
keycode 52 = period greater
|
||||
control keycode 52 = Compose
|
||||
alt keycode 52 = Meta_period
|
||||
keycode 53 = slash question
|
||||
control keycode 53 = Delete
|
||||
alt keycode 53 = Meta_slash
|
||||
control keycode 50 = equal
|
||||
shiftl control keycode 50 = Control_m
|
||||
control shiftr keycode 50 = Meta_m
|
||||
keycode 51 = comma
|
||||
shift keycode 51 = semicolon
|
||||
control keycode 51 = parenright
|
||||
shiftl control keycode 51 = bracketright
|
||||
control shiftr keycode 51 = bracketright
|
||||
keycode 52 = period
|
||||
shift keycode 52 = colon
|
||||
control keycode 52 = less
|
||||
shiftl control keycode 52 = braceleft
|
||||
control shiftr keycode 52 = braceleft
|
||||
keycode 53 = slash
|
||||
shift keycode 53 = question
|
||||
control keycode 53 = Num_Lock
|
||||
shiftl control keycode 53 = Num_Lock
|
||||
control shiftr keycode 53 = Num_Lock
|
||||
keycode 54 = Shift
|
||||
keycode 55 = KP_Multiply
|
||||
keycode 56 = Alt
|
||||
keycode 57 = space space
|
||||
control keycode 57 = nul
|
||||
alt keycode 57 = Meta_space
|
||||
keycode 58 = Caps_Lock
|
||||
keycode 59 = F1 F11 Console_13
|
||||
control keycode 59 = F1
|
||||
alt keycode 59 = Console_1
|
||||
control alt keycode 59 = Console_1
|
||||
keycode 60 = F2 F12 Console_14
|
||||
control keycode 60 = F2
|
||||
alt keycode 60 = Console_2
|
||||
control alt keycode 60 = Console_2
|
||||
keycode 61 = F3 F13 Console_15
|
||||
control keycode 61 = F3
|
||||
alt keycode 61 = Console_3
|
||||
control alt keycode 61 = Console_3
|
||||
keycode 62 = F4 F14 Console_16
|
||||
control keycode 62 = F4
|
||||
alt keycode 62 = Console_4
|
||||
control alt keycode 62 = Console_4
|
||||
keycode 63 = F5 F15 Console_17
|
||||
control keycode 63 = F5
|
||||
alt keycode 63 = Console_5
|
||||
control alt keycode 63 = Console_5
|
||||
keycode 64 = F6 F16 Console_18
|
||||
control keycode 64 = F6
|
||||
alt keycode 64 = Console_6
|
||||
control alt keycode 64 = Console_6
|
||||
keycode 65 = F7 F17 Console_19
|
||||
control keycode 65 = F7
|
||||
alt keycode 65 = Console_7
|
||||
control alt keycode 65 = Console_7
|
||||
keycode 66 = F8 F18 Console_20
|
||||
control keycode 66 = F8
|
||||
alt keycode 66 = Console_8
|
||||
control alt keycode 66 = Console_8
|
||||
keycode 67 = F9 F19 Console_21
|
||||
control keycode 67 = F9
|
||||
alt keycode 67 = Console_9
|
||||
control alt keycode 67 = Console_9
|
||||
keycode 68 = F10 F20 Console_22
|
||||
control keycode 68 = F10
|
||||
alt keycode 68 = Console_10
|
||||
control alt keycode 68 = Console_10
|
||||
keycode 69 = Num_Lock
|
||||
shift keycode 69 = Bare_Num_Lock
|
||||
keycode 70 = Scroll_Lock Show_Memory Show_Registers
|
||||
control keycode 70 = Show_State
|
||||
alt keycode 70 = Scroll_Lock
|
||||
keycode 71 = KP_7
|
||||
alt keycode 71 = Ascii_7
|
||||
altgr keycode 71 = Hex_7
|
||||
keycode 72 = KP_8
|
||||
alt keycode 72 = Ascii_8
|
||||
altgr keycode 72 = Hex_8
|
||||
keycode 73 = KP_9
|
||||
alt keycode 73 = Ascii_9
|
||||
altgr keycode 73 = Hex_9
|
||||
keycode 74 = KP_Subtract
|
||||
keycode 75 = KP_4
|
||||
alt keycode 75 = Ascii_4
|
||||
altgr keycode 75 = Hex_4
|
||||
keycode 76 = KP_5
|
||||
alt keycode 76 = Ascii_5
|
||||
altgr keycode 76 = Hex_5
|
||||
keycode 77 = KP_6
|
||||
alt keycode 77 = Ascii_6
|
||||
altgr keycode 77 = Hex_6
|
||||
keycode 78 = KP_Add
|
||||
keycode 79 = KP_1
|
||||
alt keycode 79 = Ascii_1
|
||||
altgr keycode 79 = Hex_1
|
||||
keycode 80 = KP_2
|
||||
alt keycode 80 = Ascii_2
|
||||
altgr keycode 80 = Hex_2
|
||||
keycode 81 = KP_3
|
||||
alt keycode 81 = Ascii_3
|
||||
altgr keycode 81 = Hex_3
|
||||
keycode 82 = KP_0
|
||||
alt keycode 82 = Ascii_0
|
||||
altgr keycode 82 = Hex_0
|
||||
keycode 83 = KP_Period
|
||||
# altgr control keycode 83 = Boot
|
||||
control alt keycode 83 = Boot
|
||||
keycode 84 = Last_Console
|
||||
keycode 85 =
|
||||
keycode 86 = less greater bar
|
||||
alt keycode 86 = Meta_less
|
||||
keycode 87 = F11 F11 Console_23
|
||||
control keycode 87 = F11
|
||||
alt keycode 87 = Console_11
|
||||
control alt keycode 87 = Console_11
|
||||
keycode 88 = F12 F12 Console_24
|
||||
control keycode 88 = F12
|
||||
alt keycode 88 = Console_12
|
||||
control alt keycode 88 = Console_12
|
||||
keycode 89 =
|
||||
keycode 90 =
|
||||
keycode 91 =
|
||||
keycode 92 =
|
||||
keycode 93 =
|
||||
keycode 94 =
|
||||
keycode 95 =
|
||||
keycode 96 = KP_Enter
|
||||
keycode 57 = space
|
||||
shift keycode 57 = bar
|
||||
control keycode 57 = nul
|
||||
shiftl control keycode 57 = grave
|
||||
control shiftr keycode 57 = grave
|
||||
keycode 97 = Control
|
||||
keycode 98 = KP_Divide
|
||||
keycode 99 = Control_backslash
|
||||
control keycode 99 = Control_backslash
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
shift keycode 104 = Scroll_Backward
|
||||
keycode 105 = Left
|
||||
alt keycode 105 = Decr_Console
|
||||
keycode 106 = Right
|
||||
alt keycode 106 = Incr_Console
|
||||
keycode 107 = Select
|
||||
keycode 108 = Down
|
||||
keycode 109 = Next
|
||||
shift keycode 109 = Scroll_Forward
|
||||
keycode 110 = Insert
|
||||
keycode 111 = Remove
|
||||
# altgr control keycode 111 = Boot
|
||||
control alt keycode 111 = Boot
|
||||
keycode 112 = Macro
|
||||
keycode 113 = F13
|
||||
keycode 114 = F14
|
||||
keycode 115 = Help
|
||||
keycode 116 = Do
|
||||
keycode 117 = F17
|
||||
keycode 118 = KP_MinPlus
|
||||
keycode 119 = Pause
|
||||
keycode 120 =
|
||||
keycode 121 =
|
||||
keycode 122 =
|
||||
keycode 123 =
|
||||
keycode 124 =
|
||||
keycode 125 =
|
||||
keycode 126 =
|
||||
keycode 127 =
|
||||
string F1 = "\033[[A"
|
||||
string F2 = "\033[[B"
|
||||
string F3 = "\033[[C"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
include linux-openzaurus.inc
|
||||
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
# Handy URLs
|
||||
# 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 \
|
|||
${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
|
||||
${RPSRC}/poodle_mmc-r0.patch;patch=1 \
|
||||
${RPSRC}/poodle_irda-r0.patch;patch=1 \
|
||||
${RPSRC}/ide_not_removable-r0.patch;patch=1 \
|
||||
${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
|
||||
${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
|
||||
${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 \
|
|||
${DOSRC}/tosa-irda-r3.patch;patch=1 \
|
||||
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
|
||||
${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \
|
||||
${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
|
||||
${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
|
||||
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
|
||||
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
|
||||
file://add-oz-release-string.patch;patch=1 \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
LICENSE = "GPL"
|
||||
MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
|
||||
PR = "r3"
|
||||
PR = "r4"
|
||||
|
||||
DEPENDS = "base-passwd"
|
||||
RDEPENDS = "hotplug"
|
||||
#RDEPENDS = "hotplug"
|
||||
|
||||
SRC_URI = "file://fixup-770.sh"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
|
||||
removing kernel modules for Linux (versions 2.5.48 and above). It serves \
|
||||
the same function that the modutils package serves for Linux 2.4."
|
||||
PR = "r2"
|
||||
|
||||
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
|
||||
RDEPENDS_${PN} += "module-init-tools-depmod"
|
||||
|
||||
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
|
||||
FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
|
||||
|
||||
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
|
||||
file://ignore_arch_directory;patch=1 \
|
||||
file://modutils_extension;patch=1 \
|
||||
file://no_man_rebuild;patch=1 \
|
||||
file://manpagesopt;patch=1 \
|
||||
file://soc.patch;patch=1;pnum=0"
|
||||
S = "${WORKDIR}/module-init-tools-${PV}"
|
||||
|
||||
EXTRA_OECONF = "--disable-manpages"
|
||||
|
||||
bindir = "/bin"
|
||||
sbindir = "/sbin"
|
||||
|
||||
inherit autotools
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
|
||||
mv ${D}/$f ${D}/$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --install /$f $bn /$f.26 20
|
||||
done
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --remove $bn /$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools-depmod() {
|
||||
#!/bin/sh
|
||||
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
update-alternatives --remove depmod /sbin/depmod.26
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
|
||||
DEPENDS = "sysfsutils udev"
|
||||
RDEPENDS = "udev"
|
||||
DEPENDS = "sysfsutils udev module-init-tools"
|
||||
RDEPENDS = "udev module-init-tools"
|
||||
HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
|
||||
SECTION = "kernel/userland"
|
||||
PRIORITY = "optional"
|
||||
|
|
@ -8,15 +8,11 @@ PRIORITY = "optional"
|
|||
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
|
||||
S = "${WORKDIR}/pcmciautils-${PV}"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
inherit update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "coldplug"
|
||||
INITSCRIPT_PARAMS = "defaults"
|
||||
PR = "r3"
|
||||
|
||||
export HOSTCC = "${BUILD_CC}"
|
||||
export etcdir = "${sysconfdir}"
|
||||
export sbindir = "${base_sbindir}"
|
||||
export pcmciaconfdir = "${sysconfdir}/pcmcia"
|
||||
export udevrulesdir = "${sysconfdir}/udev/rules.d"
|
||||
export UDEV = 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
# The use of these rules is not recommended or supported.
|
||||
# In a world where devices can come and go at any time, the devfs scheme
|
||||
# of simple device enumeration does not help _anything_. Just forget about
|
||||
# it. Use custom rules to name your device or look at the persistent device
|
||||
# naming scheme, which is implemented for disks and add your subsystem.
|
||||
|
||||
# ide block devices
|
||||
BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
|
||||
|
||||
# md block devices
|
||||
KERNEL="md[0-9]*", NAME="md/%n"
|
||||
|
||||
# floppy devices
|
||||
KERNEL="fd[0-9]*", NAME="floppy/%n"
|
||||
|
||||
# tty devices
|
||||
KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"
|
||||
KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k"
|
||||
KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
|
||||
|
||||
# vc devices
|
||||
KERNEL="vcs", NAME="vcc/0"
|
||||
KERNEL="vcs[0-9]*", NAME="vcc/%n"
|
||||
KERNEL="vcsa", NAME="vcc/a0"
|
||||
KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
|
||||
|
||||
# v4l devices
|
||||
KERNEL="video[0-9]*", NAME="v4l/video%n"
|
||||
KERNEL="radio[0-9]*", NAME="v4l/radio%n"
|
||||
KERNEL="vbi[0-9]*", NAME="v4l/vbi%n"
|
||||
KERNEL="vtx[0-9]*", NAME="v4l/vtx%n"
|
||||
|
||||
# dm devices (ignore them)
|
||||
KERNEL="dm-[0-9]*", NAME=""
|
||||
|
||||
# i2c devices
|
||||
KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
|
||||
|
||||
# loop devices
|
||||
KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
|
||||
|
||||
# ramdisks
|
||||
KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
|
||||
|
||||
# framebuffer devices
|
||||
KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
|
||||
|
||||
# misc
|
||||
KERNEL="rtc", NAME="misc/%k", SYMLINK="%k"
|
||||
KERNEL="psaux", NAME="misc/%k", SYMLINK="%k"
|
||||
KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
|
||||
KERNEL="rtc", NAME="misc/%k", SYMLINK="%k"
|
||||
KERNEL="psaux", NAME="misc/%k", SYMLINK="%k"
|
||||
KERNEL="uinput", NAME="misc/%k", SYMLINK="%k"
|
||||
|
||||
# alsa devices
|
||||
KERNEL="controlC[0-9]*", NAME="snd/%k"
|
||||
KERNEL="hw[CD0-9]*", NAME="snd/%k"
|
||||
KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
|
||||
KERNEL="midi[CD0-9]*", NAME="snd/%k"
|
||||
KERNEL="timer", NAME="snd/%k"
|
||||
KERNEL="seq", NAME="snd/%k"
|
||||
|
||||
# oss devices
|
||||
KERNEL="audio*", NAME="sound/%k", SYMLINK="%k"
|
||||
KERNEL="dmmidi", NAME="sound/%k", SYMLINK="%k"
|
||||
KERNEL="dsp*", NAME="sound/%k", SYMLINK="%k"
|
||||
KERNEL="midi*", NAME="sound/%k", SYMLINK="%k"
|
||||
KERNEL="mixer*", NAME="sound/%k", SYMLINK="%k"
|
||||
KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k"
|
||||
|
||||
# input devices
|
||||
KERNEL="mice", NAME="input/%k"
|
||||
KERNEL="mouse*", NAME="input/%k"
|
||||
KERNEL="event*", NAME="input/%k"
|
||||
KERNEL="js*", NAME="input/%k"
|
||||
KERNEL="ts*", NAME="input/%k"
|
||||
|
||||
# USB devices
|
||||
KERNEL="hiddev*", NAME="usb/%k"
|
||||
KERNEL="auer*", NAME="usb/%k"
|
||||
KERNEL="legousbtower*", NAME="usb/%k"
|
||||
KERNEL="dabusb*", NAME="usb/%k"
|
||||
BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
|
||||
|
||||
# netlink devices
|
||||
KERNEL="route", NAME="netlink/%k"
|
||||
KERNEL="skip", NAME="netlink/%k"
|
||||
KERNEL="usersock", NAME="netlink/%k"
|
||||
KERNEL="fwmonitor", NAME="netlink/%k"
|
||||
KERNEL="tcpdiag", NAME="netlink/%k"
|
||||
KERNEL="nflog", NAME="netlink/%k"
|
||||
KERNEL="xfrm", NAME="netlink/%k"
|
||||
KERNEL="arpd", NAME="netlink/%k"
|
||||
KERNEL="route6", NAME="netlink/%k"
|
||||
KERNEL="ip6_fw", NAME="netlink/%k"
|
||||
KERNEL="dnrtmsg", NAME="netlink/%k"
|
||||
KERNEL="tap*", NAME="netlink/%k"
|
||||
|
||||
# CAPI devices
|
||||
KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
|
||||
KERNEL="capi*", NAME="capi/%n"
|
||||
|
||||
# Network devices
|
||||
KERNEL="tun", NAME="net/%k"
|
||||
|
||||
# raw devices
|
||||
KERNEL="raw[0-9]*", NAME="raw/%k"
|
||||
|
|
@ -4,6 +4,7 @@ LICENSE = "GPL"
|
|||
|
||||
SRC_URI += " \
|
||||
file://udev.rules \
|
||||
file://devfs-udev.rules \
|
||||
file://links.conf \
|
||||
file://permissions.rules \
|
||||
file://mount.sh \
|
||||
|
|
@ -49,7 +50,7 @@ do_install () {
|
|||
install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
|
||||
install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
|
||||
if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
|
||||
install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules
|
||||
install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
|
||||
fi
|
||||
|
||||
install -d ${D}${sysconfdir}/udev/scripts/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
|
|||
|
||||
include udev.inc
|
||||
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
||||
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200
|
||||
+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200
|
||||
@@ -56,7 +56,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#ifndef ERRORDB
|
||||
-#define ERRORDB "/usr/lib/X11/XErrorDB"
|
||||
+#define ERRORDB "/usr/share/X11/XErrorDB"
|
||||
#endif
|
||||
|
||||
/*
|
||||
--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200
|
||||
+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "Key.h"
|
||||
|
||||
#ifndef KEYSYMDB
|
||||
-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
|
||||
+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
|
||||
#endif
|
||||
|
||||
static Bool initialized;
|
||||
|
|
@ -7,9 +7,10 @@ DESCRIPTION = "Base X libs."
|
|||
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
|
||||
FILES_${PN}-locale += "${datadir}/X11/locale"
|
||||
PROVIDES = "x11"
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
|
||||
file://errordb-keysymdb-path-fix.patch;patch=1 \
|
||||
file://autofoo.patch;patch=1"
|
||||
S = "${WORKDIR}/libX11-${PV}"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue