From pierre@home.poildetroll.net  Sun Jan 15 20:02:52 2012
Return-Path: <pierre@home.poildetroll.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F33261065678
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 Jan 2012 20:02:52 +0000 (UTC)
	(envelope-from pierre@home.poildetroll.net)
Received: from kashyyyk.home.poildetroll.net (kashyyyk.home.poildetroll.net [IPv6:2001:910:10b7::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A0BA8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 Jan 2012 20:02:52 +0000 (UTC)
Received: from alderaan.home.poildetroll.net (alderaan.home.poildetroll.net [IPv6:2001:910:10b7:f00:6ef0:49ff:fe5e:e54c])
	by kashyyyk.home.poildetroll.net (Postfix) with ESMTP id B2F0FF2FAC
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 Jan 2012 21:02:49 +0100 (CET)
Received: by alderaan.home.poildetroll.net (Postfix, from userid 1001)
	id 6063586C; Sun, 15 Jan 2012 21:02:49 +0100 (CET)
Message-Id: <20120115200249.6063586C@alderaan.home.poildetroll.net>
Date: Sun, 15 Jan 2012 21:02:49 +0100 (CET)
From: Pierre Guinoiseau <pierre@guinoiseau.eu>
Reply-To: Pierre Guinoiseau <pierre@guinoiseau.eu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] regression: sysinstall(8) is still built and installed with WITHOUT_SYSINSTALL=YES
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         164185
>Category:       bin
>Synopsis:       [patch] regression: sysinstall(8) is still built and installed with WITHOUT_SYSINSTALL=YES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 15 20:10:09 UTC 2012
>Closed-Date:    Mon Jan 16 04:17:17 UTC 2012
>Last-Modified:  Mon Jan 16 04:17:17 UTC 2012
>Originator:     Pierre Guinoiseau <pierre@guinoiseau.eu>
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD alderaan.home.poildetroll.net 9.0-STABLE FreeBSD 9.0-STABLE #0 r229830M: Mon Jan 9 01:23:19 CET 2012 root@alderaan.home.poildetroll.net:/usr/obj/usr/src/sys/ALDERAAN amd64


	
>Description:

On FreeBSD 9.0-RELEASE and 9-STABLE, sysinstall(8) is still built and installed
if WITHOUT_SYSINSTALL is defined in /etc/src.conf. This didn't occured on
branch 8, and no longer occur on current (obviously). Revision 212525 seems to
be the origin of this regression. The attached patch fixes it.

Please note also that sysinstall cannot build if WITHOUT_SYSCONS is defined, we
may need to add a condition test for this too.

>How-To-Repeat:

- add WITHOUT_SYSINSTALL=YES in /etc/src.conf
- make buildworld installworld for 9.0-RELEASE or 9-STABLE
- /usr/sbin/sysinstall is installed

>Fix:

	

--- usr.sbin-Makefile-sysinstall.diff begins here ---
Index: Makefile.sparc64
===================================================================
--- Makefile.sparc64	(revision 229830)
+++ Makefile.sparc64	(working copy)
@@ -5,4 +5,5 @@
 SUBDIR+=	ofwdump
 .if ${MK_SYSINSTALL} != "no"
 SUBDIR+=	sade
+SUBDIR+=	sysinstall
 .endif
Index: Makefile
===================================================================
--- Makefile	(revision 230152)
+++ Makefile	(working copy)
@@ -290,8 +290,6 @@
 SUBDIR+=	sendmail
 .endif
 
-SUBDIR+=	sysinstall
-
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch
Index: Makefile.i386
===================================================================
--- Makefile.i386	(revision 229830)
+++ Makefile.i386	(working copy)
@@ -23,6 +23,7 @@
 SUBDIR+=	pnpinfo
 .if ${MK_SYSINSTALL} != "no"
 SUBDIR+=	sade
+SUBDIR+=	sysinstall
 .endif
 SUBDIR+=	sicontrol
 SUBDIR+=	spkrtest
Index: Makefile.amd64
===================================================================
--- Makefile.amd64	(revision 229830)
+++ Makefile.amd64	(working copy)
@@ -29,5 +29,7 @@
 SUBDIR+=	spkrtest
 .if ${MK_SYSINSTALL} != "no"
 SUBDIR+=	sade
+SUBDIR+=	sysinstall
 .endif
+
 SUBDIR+=	zzz
--- usr.sbin-Makefile-sysinstall.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Mon Jan 16 00:25:21 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164185 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/164185: commit references a PR
Date: Mon, 16 Jan 2012 04:00:53 +0000 (UTC)

 Author: eadler (ports committer)
 Date: Mon Jan 16 04:00:32 2012
 New Revision: 230187
 URL: http://svn.freebsd.org/changeset/base/230187
 
 Log:
   - Listen to WITHOUT_SYSINSTALL
   
   PR:		bin/164185
   Submitted by:	Pierre Guinoiseau <pierre@guinoiseau.eu>
   Reviewed by:	imp
   Approved by:	cperciva
   MFC After	3 days
 
 Modified:
   stable/9/usr.sbin/Makefile
 
 Modified: stable/9/usr.sbin/Makefile
 ==============================================================================
 --- stable/9/usr.sbin/Makefile	Mon Jan 16 03:42:40 2012	(r230186)
 +++ stable/9/usr.sbin/Makefile	Mon Jan 16 04:00:32 2012	(r230187)
 @@ -290,7 +290,9 @@ SUBDIR+=	praliases
  SUBDIR+=	sendmail
  .endif
  
 +.if ${MK_SYSINSTALL} != "no"
  SUBDIR+=	sysinstall
 +.endif
  
  .if ${MK_TOOLCHAIN} != "no"
  SUBDIR+=	config
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Mon Jan 16 04:17:16 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164185 
>Unformatted:
