From owner-freebsd-bugs Fri Aug 2 7: 0:20 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCB9A37B401 for ; Fri, 2 Aug 2002 07:00:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2042043E77 for ; Fri, 2 Aug 2002 07:00:13 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g72E0CJU035182 for ; Fri, 2 Aug 2002 07:00:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g72E0ChH035180; Fri, 2 Aug 2002 07:00:12 -0700 (PDT) Date: Fri, 2 Aug 2002 07:00:12 -0700 (PDT) Message-Id: <200208021400.g72E0ChH035180@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: David Sanderson Subject: Re: conf/41241: sysinstall build uses kbdcontrol keymaps from the host instead of the source tree Reply-To: David Sanderson Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR conf/41241; it has been noted by GNATS. From: David Sanderson To: Peter Pentchev Cc: bug-followup@FreeBSD.org Subject: Re: conf/41241: sysinstall build uses kbdcontrol keymaps from the host instead of the source tree Date: Fri, 02 Aug 2002 09:54:36 -0400 | > >Fix: | > The following patch to my copy of src/release/sysinstall/Makefile seems | > to do the trick: | > | > @@ -82,7 +82,7 @@ | > keymap.h: | > rm -f keymap.tmp | > for map in ${KEYMAPS} ; do \ | > - kbdcontrol -L $$map | \ | > + (cd ${.CURDIR}/../../share/syscons/keymaps; kbdcontrol -L $$map) | \ | > sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \ | > done | > echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp | | Might it not be better to use 'kbdcontrol -L ${.CURDIR}/$$map' ? Well, I think it would have to be kbdcontrol -L ${.CURDIR}/../../share/syscons/keymaps/$$map but I take your point. The problem with doing this is that kbdcontrol incorporates the path given on the command line into the names of the variables it creates. For instance (using installed keymaps): $ kbdcontrol -L /usr/share/syscons/keymaps/ua.koi8-u.kbd | grep ua_koi8 static keymap_t keymap__usr_share_syscons_keymaps_ua_koi8_u_kbd = { 0xec, { static accentmap_t accentmap__usr_share_syscons_keymaps_ua_koi8_u_kbd = { 0 }; $ kbdcontrol -L ua.koi8-u.kbd | grep ua_koi8 static keymap_t keymap_ua_koi8_u_kbd = { 0xec, { static accentmap_t accentmap_ua_koi8_u_kbd = { 0 }; Since my goal is to be able to compile the 4.6 sysinstall on a 4.3 system, I chose a solution that required no changes to kbdcontrol. I suppose I *could* alter the loop in the Makefile that generates the keymapInfos array to use the longer symbol names, but I thought that just cd'ing before running the command would be simpler! :-) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message