svn commit: r230539 - in stable/9: . release

[Gleb Smirnoff]

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