From owner-svn-src-stable@FreeBSD.ORG  Wed Jan 25 13:47:56 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 047EE106566C;
	Wed, 25 Jan 2012 13:47:56 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C854F8FC0C;
	Wed, 25 Jan 2012 13:47:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0PDltOk027284;
	Wed, 25 Jan 2012 13:47:55 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0PDlteX027281;
	Wed, 25 Jan 2012 13:47:55 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201251347.q0PDlteX027281@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 25 Jan 2012 13:47:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230539 - in stable/9: . release
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2012 13:47:56 -0000

Author: glebius
Date: Wed Jan 25 13:47:55 2012
New Revision: 230539
URL: http://svn.freebsd.org/changeset/base/230539

Log:
  Merge r230127 from head/:
    Restore functionality to pack several kernels into release. All
    kernels specified by KERNCONF are built and packed into release.
    The first one is packed into kernel.txz, all others to
    kernel.CONFIG.txz.
  
    The first one is installed on bootables in /boot.

Modified:
  stable/9/Makefile.inc1   (contents, props changed)
  stable/9/release/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/release/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Wed Jan 25 12:43:27 2012	(r230538)
+++ stable/9/Makefile.inc1	Wed Jan 25 13:47:55 2012	(r230539)
@@ -885,10 +885,21 @@ distributekernel distributekernel.debug:
 	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
 	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
+.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	cd ${KRNLOBJDIR}/${_kernel}; \
+	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    KERNEL=${INSTKERNNAME}.${_kernel} \
+	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
+	    ${.TARGET:S/distributekernel/install/}
+.endfor
 
 packagekernel:
-	${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \
+	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
+.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
+.endfor
 
 #
 # doxygen

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Wed Jan 25 12:43:27 2012	(r230538)
+++ stable/9/release/Makefile	Wed Jan 25 13:47:55 2012	(r230539)
@@ -75,7 +75,7 @@ base.txz:
 kernel.txz:
 	-mkdir ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${DISTDIR}
-	mv ${DISTDIR}/kernel.txz ${.OBJDIR}
+	mv ${DISTDIR}/kernel*.txz ${.OBJDIR}
 
 src.txz:
 	-mkdir -p ${DISTDIR}/usr