[oe-commits] org.oe.dev merge of '3b5424db9b8ce0b7d550ad80e57b9462b0de36f8'
oe commit
oe at amethyst.openembedded.net
Sun Jun 8 21:57:51 UTC 2008
merge of '3b5424db9b8ce0b7d550ad80e57b9462b0de36f8'
and '779cae4a07162d76a1d0ec8366a1e35442716ab1'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 27dcd1879abfc55b1e4615a1984b94025caecc9e
ViewMTN: http://monotone.openembedded.org/revision/info/27dcd1879abfc55b1e4615a1984b94025caecc9e
Files:
1
packages/libopie/libopie2/ipaq_rotate_fix.patch
packages/icewm/icewm-1.2.20
packages/icewm/icewm-1.2.20/configure.patch
packages/icewm/icewm-1.2.20/makefile.patch
packages/icewm/icewm_1.2.20.bb
packages/dropbear/dropbear-0.50
packages/dropbear/dropbear-0.51
packages/dropbear/dropbear_0.50.bb
packages/dropbear/dropbear_0.51.bb
packages/handsfree
packages/handsfree/files
packages/setserial/files
packages/devio/devio-sdk.inc
packages/devio/devio-sdk_1.2.bb
packages/dropbear/dropbear-0.51/allow-nopw.patch
packages/handsfree/files/Makefile.patch
packages/handsfree/handsfree_0.1.bb
packages/images/fso-image-light.bb
packages/meta/meta-toolchain-slugos.bb
packages/setserial/files/addflags.patch
packages/tasks/task-slugos-toolchain-host.bb
packages/bluesnarfer/bluesnarfer.bb
packages/dropbear/dropbear.inc
packages/icewm/icewm-1.2.30/makefile.patch
packages/icewm/icewm_1.2.30.bb
packages/keymaps/files/tosa/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/setserial/setserial_2.17.bb
Diffs:
#
# mt diff -r3b5424db9b8ce0b7d550ad80e57b9462b0de36f8 -r27dcd1879abfc55b1e4615a1984b94025caecc9e
#
#
#
# add_file "packages/libopie/libopie2/ipaq_rotate_fix.patch"
# content [1129069abce417b89f7e1a975dd2f426736c6db5]
#
============================================================
--- packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
+++ packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:01.000000000 +0100
++++ libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:40.000000000 +0100
+@@ -331,16 +331,10 @@
+ case Key_Down : {
+ int quarters;
+ switch (d->m_rotation) {
+- case Rot0: quarters = 3/*270deg*/; break;
+- case Rot90: quarters = 2/*270deg*/; break;
+- case Rot180: quarters = 1/*270deg*/; break;
+- case Rot270: quarters = 0/*270deg*/; break;
+- }
+- if( d->m_model == Model_iPAQ_H22xx ) {
+- // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+- // added a temporary workaround for this here, but the bug should be fixed properly
+- // later in the right place. - Paul Eggleton 25/07/2007
+- quarters = 0;
++ case Rot0: quarters = 0/*0deg*/; break;
++ case Rot90: quarters = 1/*90deg*/; break;
++ case Rot180: quarters = 2/*180deg*/; break;
++ case Rot270: quarters = 3/*270deg*/; break;
+ }
+ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+ break;
#
# mt diff -r779cae4a07162d76a1d0ec8366a1e35442716ab1 -r27dcd1879abfc55b1e4615a1984b94025caecc9e
#
#
#
# delete "packages/icewm/icewm-1.2.20"
#
# delete "packages/icewm/icewm-1.2.20/configure.patch"
#
# delete "packages/icewm/icewm-1.2.20/makefile.patch"
#
# delete "packages/icewm/icewm_1.2.20.bb"
#
# rename "packages/dropbear/dropbear-0.50"
# to "packages/dropbear/dropbear-0.51"
#
# rename "packages/dropbear/dropbear_0.50.bb"
# to "packages/dropbear/dropbear_0.51.bb"
#
# add_dir "packages/handsfree"
#
# add_dir "packages/handsfree/files"
#
# add_dir "packages/setserial/files"
#
# add_file "packages/devio/devio-sdk.inc"
# content [1c7af478205106bc6e492b4c12447529ed48dff6]
#
# add_file "packages/devio/devio-sdk_1.2.bb"
# content [d77b06e459f4b840ffbf33c3d46ac1ba26638bf0]
#
# add_file "packages/dropbear/dropbear-0.51/allow-nopw.patch"
# content [c5ccbb00c5a8e24ff7177af9bffdda9110038b88]
#
# add_file "packages/handsfree/files/Makefile.patch"
# content [439341a82ade64343c72a93235f03635a6bb14f5]
#
# add_file "packages/handsfree/handsfree_0.1.bb"
# content [d36308d10dc175fe42a71aba4dc75b9f216bea8e]
#
# add_file "packages/images/fso-image-light.bb"
# content [5b92297a61364ebbf08c76e0b94bd35e2e25358f]
#
# add_file "packages/meta/meta-toolchain-slugos.bb"
# content [13c90521af43d63cabeb02d46e7aa1458318d5f0]
#
# add_file "packages/setserial/files/addflags.patch"
# content [2eb781c921e40be25c2fd7d9eb2b8742704348e2]
#
# add_file "packages/tasks/task-slugos-toolchain-host.bb"
# content [b8ec3022f159eb44d3cc58bd2b7f652e0d7b4bfc]
#
# patch "packages/bluesnarfer/bluesnarfer.bb"
# from [054791dddcd30de975ecb4ae0941514df3a94a8a]
# to [167efb7d04806b17a766a17f4716ec0e79b74027]
#
# patch "packages/dropbear/dropbear.inc"
# from [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
# to [8974ff1e11e258705f1ba627535481893748e0b1]
#
# patch "packages/dropbear/dropbear_0.51.bb"
# from [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
# to [b4549d3c7ecf3920758e70e164410850ae6bebe8]
#
# patch "packages/icewm/icewm-1.2.30/makefile.patch"
# from [343b885ad076cbadebd0006881f4d3f735b3a4a6]
# to [29432933f65f26e92c84768f7ccc82de5dc511dd]
#
# patch "packages/icewm/icewm_1.2.30.bb"
# from [1afb403a34441aa9e4586f80e8bd2a29028cf9a4]
# to [abd74fbb9ac47c0b4b9a5435273eb52eb6cf99c9]
#
# patch "packages/keymaps/files/tosa/keymap-2.6.map"
# from [d31f331d2aa8f5c3b6a525e6d896254e0de31b80]
# to [ca6f9018b4349221c754ec336da113b01066f05b]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [3ca60513019e86146c6189d1b3436b35b168c96b]
# to [5dbbf11e709fbfd0c371921a5f538d7f93867ec3]
#
# patch "packages/setserial/setserial_2.17.bb"
# from [2689116d9b720aa18d50f12dfca230c7ae906067]
# to [23618276cfac5fc763e54a474a04b74d52e02b50]
#
============================================================
--- packages/devio/devio-sdk.inc 1c7af478205106bc6e492b4c12447529ed48dff6
+++ packages/devio/devio-sdk.inc 1c7af478205106bc6e492b4c12447529ed48dff6
@@ -0,0 +1,5 @@
+# Set the installation dir back to the default
+sbindir = "${exec_prefix}/sbin"
+bindir = "${exec_prefix}/bin"
+
+inherit sdk
============================================================
--- packages/devio/devio-sdk_1.2.bb d77b06e459f4b840ffbf33c3d46ac1ba26638bf0
+++ packages/devio/devio-sdk_1.2.bb d77b06e459f4b840ffbf33c3d46ac1ba26638bf0
@@ -0,0 +1,3 @@
+# This package builds the devio program for the build architecture
+require devio.inc
+require devio-sdk.inc
============================================================
--- packages/dropbear/dropbear-0.51/allow-nopw.patch c5ccbb00c5a8e24ff7177af9bffdda9110038b88
+++ packages/dropbear/dropbear-0.51/allow-nopw.patch c5ccbb00c5a8e24ff7177af9bffdda9110038b88
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+ send_msg_userauth_failure(0, 1);
+ return DROPBEAR_FAILURE;
+ }
+-
++#ifdef DISALLOW_EMPTY_PW
+ /* check for an empty password */
+ if (ses.authstate.pw_passwd[0] == '\0') {
+ TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+ send_msg_userauth_failure(0, 1);
+ return DROPBEAR_FAILURE;
+ }
+-
++#endif
+ TRACE(("shell is %s", ses.authstate.pw_shell))
+
+ /* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+ * since the shadow password may differ to that tested
+ * in auth.c */
+ if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+ dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+ ses.authstate.pw_name);
+ send_msg_userauth_failure(0, 1);
++#else
++ send_msg_userauth_success();
++#endif
+ return;
+ }
+
============================================================
--- packages/handsfree/files/Makefile.patch 439341a82ade64343c72a93235f03635a6bb14f5
+++ packages/handsfree/files/Makefile.patch 439341a82ade64343c72a93235f03635a6bb14f5
@@ -0,0 +1,19 @@
+--- handsfree/old/Makefile 2006-11-21 18:01:13.000000000 +0000
++++ handsfree/Makefile 2006-11-21 14:01:17.000000000 +0000
+@@ -9,12 +9,12 @@
+ # I use a dmixer as default alsa device to mix
+ # the handsfree output with other sound playback
+ #
+-ALSA_PLAY="default"
+-ALSA_REC="plughw:0,0"
++#ALSA_PLAY="default"
++#ALSA_REC="plughw:0,0"
+
+
+-LDFLAGS= -lbluetooth -lasound
+-CFLAGS=-g -Wall -DOSS=0
++#LDFLAGS= -lbluetooth -lasound
++#CFLAGS=-g -Wall -DOSS=0
+
+ all: handsfree headset
+
============================================================
--- packages/handsfree/handsfree_0.1.bb d36308d10dc175fe42a71aba4dc75b9f216bea8e
+++ packages/handsfree/handsfree_0.1.bb d36308d10dc175fe42a71aba4dc75b9f216bea8e
@@ -0,0 +1,32 @@
+DESCRIPTION = "Handsfree and Handset Bluetooth tool"
+HOMEPAGE = "http://www.soft.uni-linz.ac.at/_wiki/tiki-index.php?page=ProjectBluezHandsfree"
+SECTION = "network/misc"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS= "bluez-libs alsa-lib"
+PR = "r0"
+
+
+SRC_URI = "\
+ http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz \
+ file://Makefile.patch;patch=1 \
+"
+S = "${WORKDIR}/handsfree"
+
+# Alsa devices
+# Example: "plughw:0,0"
+ALSA_PLAY = "default"
+ALSA_REC = "default"
+
+CFLAGS =+ "-DOSS=0 "
+LDFLAGS =+ "-lbluetooth -lasound "
+
+do_compile() {
+ oe_runmake all
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 handsfree ${D}${bindir}
+ install -m 0755 headset ${D}${bindir}
+}
============================================================
--- packages/images/fso-image-light.bb 5b92297a61364ebbf08c76e0b94bd35e2e25358f
+++ packages/images/fso-image-light.bb 5b92297a61364ebbf08c76e0b94bd35e2e25358f
@@ -0,0 +1,32 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe, Light Edition
+#------------------------------------------------------
+
+require fso-image.bb
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+ ${BASE_INSTALL} \
+ ${X_INSTALL} \
+ ${PYTHON_INSTALL} \
+ ${ZHONE_INSTALL} \
+"
+
+inherit image
+
+# perform some convenience tweaks to the rootfs
+mickey_rootfs_postprocess() {
+ curdir=$PWD
+ cd ${IMAGE_ROOTFS}
+ date "+%m%d%H%M%Y" >./etc/timestamp
+ echo "alias pico=nano" >>./etc/profile
+ echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+ mkdir -p ./local/pkg
+ echo >>./etc/fstab
+ echo "# NFS Host" >>./etc/fstab
+ echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
+ cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "mickey_rootfs_postprocess"
============================================================
--- packages/meta/meta-toolchain-slugos.bb 13c90521af43d63cabeb02d46e7aa1458318d5f0
+++ packages/meta/meta-toolchain-slugos.bb 13c90521af43d63cabeb02d46e7aa1458318d5f0
@@ -0,0 +1,10 @@
+PR = "r0"
+
+TOOLCHAIN_HOST_TASK = "task-slugos-toolchain-host"
+
+# TBD: need to determine minimal library set to provide;
+# uncomment next line and bump PR when this is done.
+#TOOLCHAIN_TARGET_TASK = "task-slugos-toolchain-target"
+
+require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-slugos"
============================================================
--- packages/setserial/files/addflags.patch 2eb781c921e40be25c2fd7d9eb2b8742704348e2
+++ packages/setserial/files/addflags.patch 2eb781c921e40be25c2fd7d9eb2b8742704348e2
@@ -0,0 +1,21 @@
+Index: setserial-2.17/Makefile.in
+===================================================================
+--- setserial-2.17.orig/Makefile.in
++++ setserial-2.17/Makefile.in
+@@ -13,6 +13,7 @@ STRIP = @STRIP@
+ CC = @CC@
+ RM = rm -f
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ DEFS = @DEFS@
+ INCS = -I.
+ TAR = tar
+@@ -20,7 +21,7 @@ TAR = tar
+ all: setserial setserial.cat
+
+ setserial: setserial.c
+- $(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
+
+ setserial.cat: setserial.8
+ nroff -man setserial.8 > setserial.cat
============================================================
--- packages/tasks/task-slugos-toolchain-host.bb b8ec3022f159eb44d3cc58bd2b7f652e0d7b4bfc
+++ packages/tasks/task-slugos-toolchain-host.bb b8ec3022f159eb44d3cc58bd2b7f652e0d7b4bfc
@@ -0,0 +1,10 @@
+require task-sdk-host.bb
+PR = "r0"
+DESCRIPTION = "Packages for a standalone SlugOS external toolchain"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+ devio-sdk \
+"
============================================================
--- packages/bluesnarfer/bluesnarfer.bb 054791dddcd30de975ecb4ae0941514df3a94a8a
+++ packages/bluesnarfer/bluesnarfer.bb 167efb7d04806b17a766a17f4716ec0e79b74027
@@ -1,17 +1,14 @@
+DESCRIPTION = "Bluetooth cellphone information gatherer"
+LICENSE = "GPL"
SECTION = "network/misc"
-DESCRIPTION = "Bluetooth cellphone information gatherer"
+DEPENDS = "bluez-libs"
PV = "0.1"
-SRC_URI = "http://www.remote-exploit.org/images/a/a0/Bluesnarfer.tar.gz"
-DEFAULT_PREFERENCE="-1"
+SRC_URI = "http://www.alighieri.org/tools/bluesnarfer.tar.gz"
+S = "${WORKDIR}/bluesnarfer"
+LDFLAGS =+ "-lbluetooth"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/bluetooth "
-
-LDFLAGS_prepend = "-lbluetooth -L${STAGING_LIBDIR} "
-
-S = "${WORKDIR}/bluesnarfer"
-LICENSE = "GPL"
do_compile() {
oe_runmake bluesnarfer
}
@@ -20,4 +17,3 @@ do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/bluesnarfer ${D}${bindir}
}
-
============================================================
--- packages/dropbear/dropbear.inc 6d50c1193e4d2fa9a7c6f85db6149b36aee06851
+++ packages/dropbear/dropbear.inc 8974ff1e11e258705f1ba627535481893748e0b1
@@ -6,19 +6,21 @@ RPROVIDES = "ssh sshd"
PROVIDES = "ssh sshd"
RPROVIDES = "ssh sshd"
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
- file://urandom-xauth-changes-to-options.h.patch;patch=1 \
- file://configure.patch;patch=1 \
- file://fix-2kb-keys.patch;patch=1 \
- file://allow-nopw.patch \
- file://init"
+SRC_URI = "\
+ http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
+ file://urandom-xauth-changes-to-options.h.patch;patch=1 \
+ file://configure.patch;patch=1 \
+ file://fix-2kb-keys.patch;patch=1 \
+ file://allow-nopw.patch \
+ file://init \
+"
inherit autotools update-rc.d
INITSCRIPT_NAME = "dropbear"
INITSCRIPT_PARAMS = "defaults 10"
-CFLAGS_prepend = " -I. "
+CFLAGS =+ "-I."
LD = "${CC}"
SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
@@ -33,13 +35,13 @@ do_install() {
}
do_install() {
- install -d ${D}${sysconfdir} \
- ${D}${sysconfdir}/init.d \
- ${D}${sysconfdir}/default \
- ${D}${sysconfdir}/dropbear \
- ${D}${bindir} \
- ${D}${sbindir} \
- ${D}${localstatedir}
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -d ${D}${sysconfdir}/dropbear
+ install -d ${D}${bindir}
+ install -d ${D}${sbindir}
+ install -d ${D}${localstatedir}
install -m 0755 dropbearmulti ${D}${sbindir}/
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
@@ -62,12 +64,12 @@ pkg_postrm_append () {
}
pkg_postrm_append () {
- if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
- fi
- if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
- rm ${sysconfdir}/dropbear/dropbear_dss_host_key
- fi
- update-alternatives --remove ssh ${bindir}/dropbearmulti
- update-alternatives --remove scp ${bindir}/dropbearmulti
+ if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+ fi
+ if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+ rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+ fi
+ update-alternatives --remove ssh ${bindir}/dropbearmulti
+ update-alternatives --remove scp ${bindir}/dropbearmulti
}
============================================================
--- packages/dropbear/dropbear_0.50.bb 61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
+++ packages/dropbear/dropbear_0.51.bb b4549d3c7ecf3920758e70e164410850ae6bebe8
@@ -1,6 +1,5 @@ require dropbear.inc
require dropbear.inc
+PR = "r0"
-PR = "r1"
-
# testing
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/icewm/icewm-1.2.30/makefile.patch 343b885ad076cbadebd0006881f4d3f735b3a4a6
+++ packages/icewm/icewm-1.2.30/makefile.patch 29432933f65f26e92c84768f7ccc82de5dc511dd
@@ -1,26 +1,23 @@
--- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100
+++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100
-@@ -206,10 +206,21 @@
+@@ -206,10 +206,18 @@
%.o: %.cc
@echo " CXX " $@
@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
-
-genpref $(BINARIES):
+
-+HOSTCXX=g++
-+HOSTLD=g++
-+
+genpref.o: genpref.cc
-+ @echo " HOSTCXX " $@
-+ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
++ @echo " BUILD_CXX " $@
++ @$(BUILD_CXX) $(BUILD_CXXFLAGS) $(DEBUG) $(DEFS) $(GCCDEP) -c $<
+
+$(BINARIES):
@echo " LD " $@
@$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
+
+genpref:
-+ @echo " HOSTLD " $@
-+ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
++ @echo " BUILD_CXX " $@
++ @$(BUILD_CXX) $(BUILD_LDFLAGS) -o $@$(EXEEXT) $($@_OBJS) $(LIBS) $($@_LIBS)
################################################################################
============================================================
--- packages/icewm/icewm_1.2.30.bb 1afb403a34441aa9e4586f80e8bd2a29028cf9a4
+++ packages/icewm/icewm_1.2.30.bb abd74fbb9ac47c0b4b9a5435273eb52eb6cf99c9
@@ -1,13 +1,15 @@
+DESCRIPTION = "IceWM Window Manager"
SECTION = "x11/wm"
-DESCRIPTION = "IceWM Window Manager"
LICENSE = "GPL"
DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
RRECOMMENDS = "ttf-dejavu-sans"
-PR = "r1"
+PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
- file://makefile.patch;patch=1 \
- file://configure.patch;patch=1"
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
+ file://makefile.patch;patch=1 \
+ file://configure.patch;patch=1 \
+"
inherit autotools pkgconfig
============================================================
--- packages/keymaps/files/tosa/keymap-2.6.map d31f331d2aa8f5c3b6a525e6d896254e0de31b80
+++ packages/keymaps/files/tosa/keymap-2.6.map ca6f9018b4349221c754ec336da113b01066f05b
@@ -1,297 +1,123 @@ keymaps 0-2,4-5,8,12
# 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.
#
-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
-#ke%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list