From owner-svn-src-all@FreeBSD.ORG Fri Oct 29 19:17:08 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49D04106566C; Fri, 29 Oct 2010 19:17:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1D6428FC13; Fri, 29 Oct 2010 19:17:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9TJH8Rj051633; Fri, 29 Oct 2010 19:17:08 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9TJH8MU051631; Fri, 29 Oct 2010 19:17:08 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201010291917.o9TJH8MU051631@svn.freebsd.org> From: John Baldwin Date: Fri, 29 Oct 2010 19:17:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214523 - head/usr.sbin/config X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Oct 2010 19:17:08 -0000 Author: jhb Date: Fri Oct 29 19:17:07 2010 New Revision: 214523 URL: http://svn.freebsd.org/changeset/base/214523 Log: Remove support for creating the 'machine' symlink as well as creating the extra MACHINE_ARCH symlink for certain platforms (such as pc98). The support for creating these symlinks was added to sys/conf/kern.post.mk in changeset 152964. The intention of that commit was to remove this code from config(8), but config(8) was never updated. Approved by: imp Modified: head/usr.sbin/config/main.c Modified: head/usr.sbin/config/main.c ============================================================================== --- head/usr.sbin/config/main.c Fri Oct 29 19:07:36 2010 (r214522) +++ head/usr.sbin/config/main.c Fri Oct 29 19:17:07 2010 (r214523) @@ -108,7 +108,6 @@ main(int argc, char **argv) struct stat buf; int ch, len; char *p; - char xxx[MAXPATHLEN]; char *kernfile; int printmachine; @@ -218,32 +217,6 @@ main(int argc, char **argv) } else if (!S_ISDIR(buf.st_mode)) errx(EXIT_FAILURE, "%s isn't a directory", p); - /* - * make symbolic links in compilation directory - * for "sys" (to make genassym.c work along with #include ) - * and similarly for "machine". - */ - if (*srcdir == '\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) != 0) { - /* - * make symbolic links in compilation directory for - * machinearch, if it is different than machinename. - */ - if (*srcdir == '\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)); - } configfile(); /* put config file into kernel*/ options(); /* make options .h files */ makefile(); /* build Makefile */