From owner-svn-src-projects@freebsd.org  Tue Jan  5 18:05:32 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71BFDA63598
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  5 Jan 2016 18:05:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 41C401DE6;
 Tue,  5 Jan 2016 18:05:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05I5VRJ018424;
 Tue, 5 Jan 2016 18:05:31 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05I5VaG018423;
 Tue, 5 Jan 2016 18:05:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601051805.u05I5VaG018423@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 5 Jan 2016 18:05:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r293216 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2016 18:05:32 -0000

Author: gjb
Date: Tue Jan  5 18:05:31 2016
New Revision: 293216
URL: https://svnweb.freebsd.org/changeset/base/293216

Log:
  In 'create-kernel-packages', do not exit with an error if NO_ROOT is
  not set.  The 'stageworld' target is invoked with -DNO_ROOT, so the
  metalog file(s) will be created regardless.
  
  This matches the behavior of 'create-world-packages'.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Jan  5 17:52:14 2016	(r293215)
+++ projects/release-pkg/Makefile.inc1	Tue Jan  5 18:05:31 2016	(r293216)
@@ -1384,10 +1384,6 @@ packages:
 		${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages
 
 create-kernel-packages:
-.if !defined(NO_ROOT)
-	@echo "ERROR: create-kernel-packages can only be done with -DNO_ROOT"; \
-	false
-.endif
 	@cd ${DESTDIR}/${DISTDIR} ; \
 		awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		${DESTDIR}/${DISTDIR}/kernel.meta