From owner-freebsd-stable Fri Jun 15 5:59:19 2001 Delivered-To: freebsd-stable@freebsd.org Received: from melchior.cuivre.fr.eu.org (melchior.enst.fr [137.194.161.6]) by hub.freebsd.org (Postfix) with ESMTP id 8407F37B405 for ; Fri, 15 Jun 2001 05:59:13 -0700 (PDT) (envelope-from thomas@cuivre.fr.eu.org) Received: from melusine.cuivre.fr.eu.org (melusine.enst.fr [137.194.160.34]) by melchior.cuivre.fr.eu.org (Postfix) with ESMTP id 610687D6A for ; Fri, 15 Jun 2001 14:59:11 +0200 (CEST) Received: by melusine.cuivre.fr.eu.org (Postfix, from userid 1000) id CE54B24D02; Fri, 15 Jun 2001 14:59:09 +0200 (CEST) Date: Fri, 15 Jun 2001 14:59:09 +0200 From: Thomas Quinot To: stable@freebsd.org Subject: Recompiling -stable sysinstall Message-ID: <20010615145909.A48238@melusine.cuivre.fr.eu.org> Reply-To: thomas@cuivre.fr.eu.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi all, Trying to resolve a sysinstall problem (PR kern/24596), I endeavoured to recompile sysinstall. My source tree was cvsupped yesterday, and I have made a buildworld and buildkernel, but not installworld yet. Sysinstall failed to compile, because its Makefile assumes that the installed syscons keymaps match the source tree version (which was not the case because my previous make world did not include the Ukrainian keymaps). I do not know whether sysinstall should be comilable when world has been built but not yet installed. If so the following patch resolves this problem (it uses the source tree keymaps instead of the installed ones): --- release/sysinstall/Makefile.dist Thu Jun 14 21:55:05 2001 +++ release/sysinstall/Makefile Fri Jun 15 14:52:04 2001 @@ -87,7 +87,8 @@ 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 -- Thomas.Quinot@Cuivre.FR.EU.ORG To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message