Bug#239035: marked as done (kbd-chooser: mac/ADB keymaps inappropriate for powerpc)
Your message dated Sun, 28 Mar 2004 11:14:31 +0100
with message-id <4066a587.268.0@utvinternet.com>
and subject line closing
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 20 Mar 2004 11:38:36 +0000
>From cjwatson@flatline.org.uk Sat Mar 20 03:38:36 2004
Return-path: <cjwatson@flatline.org.uk>
Received: from chiark.greenend.org.uk [193.201.200.170] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1B4eoF-0002mR-00; Sat, 20 Mar 2004 03:38:36 -0800
Received: from [192.168.124.112] (helo=riva.lab.dotat.at)
by chiark.greenend.org.uk (Debian Exim 3.35 #1) with esmtp
for submit@bugs.debian.org
id 1B4eoD-0007F0-00; Sat, 20 Mar 2004 11:38:34 +0000
Received: from cjwatson by riva.lab.dotat.at with local (Exim 3.35 #1 (Debian))
for submit@bugs.debian.org
id 1B4eoD-0002SZ-00; Sat, 20 Mar 2004 11:38:33 +0000
Date: Sat, 20 Mar 2004 11:38:33 +0000
From: Colin Watson <cjwatson@debian.org>
To: submit@bugs.debian.org
Subject: kbd-chooser: mac/ADB keymaps inappropriate for powerpc
Message-ID: <[🔎] 20040320113832.GA9068@riva.ucam.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_12
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_12
X-Spam-Level:
Package: kbd-chooser
Version: 0.45
Severity: normal
I noticed that the reason kbd-chooser was failing on a PowerBook G4 was
that the default keyboard was mac but console-keymaps-mac wasn't in the
initrd, so I built a netboot image with that udeb added to see what
would happen. The result was a thoroughly unusable keymap, because the
keymaps in console-keymaps-mac are all based on ADB keycodes: see
http://www.debian.org/ports/powerpc/keycodes for why these are
inappropriate on powerpc. All our powerpc kernels are built with
CONFIG_MAC_ADBKEYCODES=n.
Figuring out what to do about this is the interesting bit. For the time
being, I'd suggest simply disabling mac keyboard support for powerpc.
The #if !defined(__powerpc__) hack in usb-kbd.c means that they end up
being treated as USB keyboards even though they're not, but this is OK
since the only effect is the keyboard map. It would be neater to have
some way to return a different keymap name from mac_kbd_get, though.
I've tested this on newworld powerpc and it's fine, and I'm pretty sure
it will at least not make other powerpc subarchitectures any worse; but
I'm posting this rather than committing it because perhaps there's some
more general solution, and I'm not sure about the state of ADB on m68k.
Index: Makefile
===================================================================
RCS file: /cvsroot/d-i/debian-installer/tools/kbd-chooser/Makefile,v
retrieving revision 1.25
diff -p -u -r1.25 Makefile
--- Makefile 13 Mar 2004 11:03:11 -0000 1.25
+++ Makefile 20 Mar 2004 11:36:10 -0000
@@ -45,8 +45,8 @@ CFLAGS += -DSPARC_KBD -DUSB_KBD
KEYBOARDS := sparc usb
endif
ifeq ($(ARCH),powerpc)
-CFLAGS += -DUSB_KBD -DAT_KBD -DAMIGA_KBD -DMAC_KBD
-KEYBOARDS := at usb amiga mac
+CFLAGS += -DUSB_KBD -DAT_KBD -DAMIGA_KBD
+KEYBOARDS := at usb amiga
endif
ifeq ($(ARCH),arm)
CFLAGS += -DAT_KBD -DUSB_KBD
Index: usb-kbd.c
===================================================================
RCS file: /cvsroot/d-i/debian-installer/tools/kbd-chooser/usb-kbd.c,v
retrieving revision 1.17
diff -p -u -r1.17 usb-kbd.c
--- usb-kbd.c 13 Mar 2004 10:58:16 -0000 1.17
+++ usb-kbd.c 20 Mar 2004 11:36:11 -0000
@@ -38,8 +38,9 @@ kbd_t *usb_kbd_get (kbd_t *keyboards, co
#if !defined(__powerpc__)
/* The following code tries to autodetect USB keyboards.
- * its currently implicated in debian bug #234513,
- * and excluded for beta3.
+ * While PowerMac systems are often ADB, we don't want to use ADB
+ * keycodes (http://www.debian.org/ports/powerpc/keycodes), so
+ * pretend they're USB.
*/
/* In 2.4, if "Device=usbkbd" is present in /proc/bus/usb/devices
--
Colin Watson [cjwatson@flatline.org.uk]
---------------------------------------
Received: (at 239035-done) by bugs.debian.org; 28 Mar 2004 10:14:34 +0000
>From mckinstry@computer.org Sun Mar 28 02:14:34 2004
Return-path: <mckinstry@computer.org>
Received: from ni-mail2.dna.utvinternet.net [194.46.8.26]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1B7XJJ-0003YT-00; Sun, 28 Mar 2004 02:14:34 -0800
Received: from utvinternet.com (unverified [194.46.8.35]) by ni-mail2.dna.utvinternet.net
(Vircom SMTPRS 3.1.293.1) with SMTP id <B0042876521@ni-mail2.dna.utvinternet.net> for <239035-done@bugs.debian.org>;
Sun, 28 Mar 2004 11:14:32 +0100
From: "Alastair McKinstry" <mckinstry@computer.org>
Sender: amck@utvinternet.com
Reply-to: mckinstry@computer.org
To: 239035-done@bugs.debian.org
Date: Sun, 28 Mar 2004 11:14:31 +0100
Subject: closing
X-Mailer: DMailWeb Web to Mail Gateway 2.8a, http://netwinsite.com/top_mail.htm
Message-id: <4066a587.268.0@utvinternet.com>
X-User-Info: 193.32.3.82
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Delivered-To: 239035-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=0.0 required=4.0 tests=none autolearn=no
version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Closing.
This bug fixed in previous release 0.47, which put better
detection code for ADB keyboards in mac-kbd.c
- Alastair
Reply to: