From owner-freebsd-bugs@FreeBSD.ORG Sun Jan 15 20:10:10 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381611065673 for ; Sun, 15 Jan 2012 20:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0E2878FC14 for ; Sun, 15 Jan 2012 20:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0FKA9Bp090373 for ; Sun, 15 Jan 2012 20:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0FKA9mW090372; Sun, 15 Jan 2012 20:10:09 GMT (envelope-from gnats) Resent-Date: Sun, 15 Jan 2012 20:10:09 GMT Resent-Message-Id: <201201152010.q0FKA9mW090372@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pierre Guinoiseau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F33261065678 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/164185: [patch] regression: sysinstall(8) is still built and installed with WITHOUT_SYSINSTALL=YES X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Pierre Guinoiseau List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2012 20:10:10 -0000 >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: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jan 15 20:10:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pierre Guinoiseau >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: >Unformatted: