Date: Wed, 16 May 2001 01:35:33 +0300 (EEST) From: Maxim Sobolev <sobomax@mail-in.net> To: ru@FreeBSD.ORG Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, current@FreeBSD.ORG Subject: Re: cvs commit: src Makefile.inc1 Message-ID: <200105152235.f4FMZ1130895@mail.uic-in.net> In-Reply-To: <3B017C28.4FFDBCFB@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 15 May 2001 21:57:44 +0300, Maxim Sobolev wrote: > Ruslan Ermilov wrote: > = > > On Mon, May 14, 2001 at 10:21:02AM -0700, Ruslan Ermilov wrote: > > > ru 2001/05/14 10:21:02 PDT > > > > > > Modified files: > > > . Makefile.inc1 > > > Log: > > > Add kbdcontrol(1) to bootstrap-tools. > > > This fixes the upgrade path breakage in usr.sbin/sysinstall. > > > > > > Revision Changes Path > > > 1.201 +2 -1 src/Makefile.inc1 > > > > > Argh, this doesn't work either. I first tried this with some stuff > > commented out in Makefile.inc1, and it succeeded. But at the time > > kbdcontrol is built in bootstrap-tools, ${WORLDTMP}/usr/include is > > not yet populated, and kbdcontrol.c requires an up-to-date header > > files. OTOH, the bootstrap-tools are supposed to be built under > > the host environment, so compiling against CURRENT sources would > > be a bug. Ideas? > = > Perhaps we could rip off the code that dumps keymap > file into a little utility on its own and use this utility to > bootstrap sysinstall. I could look into this > direction if there aren't better ideas. There is at least one easy way - we can check if PASTE is defined and define it to be NOP if it isn't. This would allow to use kbdcontrol as a bootstrap tool on 4-STABLE. See attached patch. -Maxim Index: kbdcontrol.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/usr.sbin/kbdcontrol/kbdcontrol.c,v retrieving revision 1.35 diff -d -u -r1.35 kbdcontrol.c --- kbdcontrol.c=092001/05/14 06:15:07=091.35 +++ kbdcontrol.c=092001/05/15 22:31:34 @@ -43,6 +43,10 @@ #include "path.h" #include "lex.h" = +#ifndef PASTE +#define=09PASTE=09NOP=09=09/* For compatibility with previous releases */ +#endif + char ctrl_names[32][4] =3D { =09"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", =09"bs ", "ht ", "nl ", "vt ", "ff ", "cr ", "so ", "si ", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105152235.f4FMZ1130895>