Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2016 18:05:31 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r293216 - projects/release-pkg
Message-ID:  <201601051805.u05I5VaG018423@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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