svn commit: r230127 - in head: . release

[Gleb Smirnoff]

Author: glebius
Date: Sun Jan 15 08:36:25 2012
New Revision: 230127
URL: http://svn.freebsd.org/changeset/base/230127

Log:
  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:
  head/Makefile.inc1
  head/release/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Jan 15 07:48:12 2012	(r230126)
+++ head/Makefile.inc1	Sun Jan 15 08:36:25 2012	(r230127)
@@ -887,10 +887,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: head/release/Makefile
==============================================================================
--- head/release/Makefile	Sun Jan 15 07:48:12 2012	(r230126)
+++ head/release/Makefile	Sun Jan 15 08:36:25 2012	(r230127)
@@ -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