Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Nov 2005 20:33:48 +0200
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/sys/conf kern.post.mk
Message-ID:  <20051130183348.GA36718@ip.net.ua>
In-Reply-To: <200511301815.jAUIF7bt057472@repoman.freebsd.org>
References:  <200511301815.jAUIF7bt057472@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--CE+1k2dSO48ffgeK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Nov 30, 2005 at 06:15:07PM +0000, Ruslan Ermilov wrote:
> ru          2005-11-30 18:15:07 UTC
>=20
>   FreeBSD src repository
>=20
>   Modified files:
>     sys/conf             kern.post.mk=20
>   Log:
>   Teach this to create the "machine" and ${MACHINE_ARCH} (for pc98
>   only now) symbolic links in the kernel compile directory, rather
>   than relying on config(8) to do this.  (The changes to config(8)
>   will be committed separately.)  This is aimed towards making the
>   config(8) as lightweight as possible.
>  =20
>   Idea by:        bde (all bugs are mine)
>  =20
>   Revision  Changes    Path
>   1.90      +27 -4     src/sys/conf/kern.post.mk
>=20
If you'd like to give it more exposure, please test it along
with the following patch to config(8):

%%%
Index: main.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/config/main.c,v
retrieving revision 1.69
diff -u -p -r1.69 main.c
--- main.c	30 Nov 2005 17:55:49 -0000	1.69
+++ main.c	30 Nov 2005 17:56:08 -0000
@@ -95,7 +95,6 @@ main(int argc, char **argv)
 	struct stat buf;
 	int ch, len;
 	char *p;
-	char xxx[MAXPATHLEN];
 	FILE *fp;
=20
 	while ((ch =3D getopt(argc, argv, "d:gpV")) !=3D -1)
@@ -166,32 +165,6 @@ main(int argc, char **argv)
 		printf("Specify machine type, e.g. ``machine i386''\n");
 		exit(1);
 	}
-	/*
-	 * make symbolic links in compilation directory
-	 * for "sys" (to make genassym.c work along with #include <sys/xxx>)
-	 * and similarly for "machine".
-	 */
-	if (*srcdir =3D=3D '\0')
-		(void)snprintf(xxx, sizeof(xxx), "../../include");
-	else
-		(void)snprintf(xxx, sizeof(xxx), "%s/%s/include",
-		    srcdir, machinename);
-	(void) unlink(path("machine"));
-	(void) symlink(xxx, path("machine"));
-	if (strcmp(machinename, machinearch) !=3D 0) {
-		/*
-		 * make symbolic links in compilation directory for
-		 * machinearch, if it is different than machinename.
-		 */
-		if (*srcdir =3D=3D '\0')
-			(void)snprintf(xxx, sizeof(xxx), "../../../%s/include",
-			    machinearch);
-		else
-			(void)snprintf(xxx, sizeof(xxx), "%s/%s/include",
-			    srcdir, machinearch);
-		(void) unlink(path(machinearch));
-		(void) symlink(xxx, path(machinearch));
-	}
 	options();			/* make options .h files */
 	makefile();			/* build Makefile */
 	headers();			/* make a lot of .h files */
%%%


Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer

--CE+1k2dSO48ffgeK
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQFDjfCMqRfpzJluFF4RAsJ4AJ46j6pZJbJ19yvdYKBxXt8kX3eaQQCglkm5
cTzaQWYwieH21NTNcfUzw3o=
=fXKR
-----END PGP SIGNATURE-----

--CE+1k2dSO48ffgeK--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051130183348.GA36718>