From owner-freebsd-current Tue May 15 7:42:59 2001 Delivered-To: freebsd-current@freebsd.org Received: from ringworld.nanolink.com (ringworld.nanolink.com [195.24.48.13]) by hub.freebsd.org (Postfix) with SMTP id 7B4A237B43C for ; Tue, 15 May 2001 07:42:49 -0700 (PDT) (envelope-from roam@orbitel.bg) Received: (qmail 17564 invoked by uid 1000); 15 May 2001 14:42:04 -0000 Date: Tue, 15 May 2001 17:42:04 +0300 From: Peter Pentchev To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, current@FreeBSD.org, sobomax@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 Message-ID: <20010515174204.P11592@ringworld.oblivion.bg> Mail-Followup-To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, current@FreeBSD.org, sobomax@FreeBSD.org References: <200105141721.f4EHL2056720@freefall.freebsd.org> <20010515161957.A54414@sunbay.com> <20010515173354.B60756@sunbay.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010515173354.B60756@sunbay.com>; from ru@FreeBSD.org on Tue, May 15, 2001 at 05:33:54PM +0300 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, May 15, 2001 at 05:33:54PM +0300, Ruslan Ermilov wrote: > OK, more details on 4.3-STABLE -> 5.0-CURRENT upgrade path breakage. > > 1. kbdcontrol(1) is used by usr.sbin/sysinstall/Makefile to generate > keymap.h with keyboard maps. > > 2. Recent usr.sbin/sysinstall/Makefile wants to generate keymap.h > from "current" keymap sources in ../../share/syscons/keymaps, > so it should use "current" kbdcontrol(1) as well because: > a) only -CURRENT kbdcontrol(1) understands ${KEYMAP_PATH} > b) only "current" kbdcontrol(1) may understand "current" keymap > file syntax, as is the keyboard "paste" feature for now. > > 3. So usr.sbin/kbdcontrol should be in Makefile.inc1:bootstrap-tools. > > 4. But bootstrap-tools are supposed to be built in a host environment, > and -CURRENT kbdcontrol(1) couldn't be built on -STABLE because it > requires -CURRENT sys/sys/kbio.h header (the PASTE define). > > I'm currently testing with -I${.CURDIR}/../../sys added to the > kbdcontrol/Makefile, but this is a gross hack. Can't you teach sysinstall/Makefile to use the kbdcontrol in ${.OBJDIR}/../kbdcontrol/kbdcontrol instead, and make it somehow depend on kbdcontrol being built beforehand? G'luck, Peter -- This sentence would be seven words long if it were six words shorter. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message