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.
This commit is contained in:
Gleb Smirnoff 2012-01-15 08:36:25 +00:00
parent 886e862866
commit d6ba7d93ba
2 changed files with 13 additions and 2 deletions

View File

@ -887,10 +887,21 @@ distributekernel distributekernel.debug:
${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \ ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
DESTDIR=${DESTDIR}/${DISTDIR}/kernel \ DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
${.TARGET:S/distributekernel/install/} ${.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: packagekernel:
${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \ cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . 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 # doxygen

View File

@ -75,7 +75,7 @@ base.txz:
kernel.txz: kernel.txz:
-mkdir ${DISTDIR} -mkdir ${DISTDIR}
cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${DISTDIR} cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${DISTDIR}
mv ${DISTDIR}/kernel.txz ${.OBJDIR} mv ${DISTDIR}/kernel*.txz ${.OBJDIR}
src.txz: src.txz:
-mkdir -p ${DISTDIR}/usr -mkdir -p ${DISTDIR}/usr