Date: Wed, 6 Jan 2016 13:26:49 -0800 From: Gleb Smirnoff <glebius@FreeBSD.org> To: Trond =?iso-8859-1?Q?Endrest=F8l?= <Trond.Endrestol@fagskolen.gjovik.no>, David Wolfskill <david@catwhisker.org>, Glen Barber <gjb@FreeBSD.org>, FreeBSD stable <freebsd-stable@freebsd.org> Subject: Re: Multiple kernels installed when KERNCONF lists more than one kernel configuration file Message-ID: <20160106212649.GD5169@FreeBSD.org> In-Reply-To: <20160106140724.GW2781@albert.catwhisker.org> <alpine.BSF.2.20.1601061322110.65744@mail.fig.ol.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--+ts6NCQ4mrNQIV8p
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Trond & David,
can you please test the attached patch. It is against stable/10 and
should restore original behaviour.
--
Totus tuus, Glebius.
--+ts6NCQ4mrNQIV8p
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.inc1.diff"
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 293275)
+++ Makefile.inc1 (working copy)
@@ -1011,6 +1011,7 @@ KERNCONFDIR?= ${KRNLCONFDIR}
BUILDKERNELS=
INSTALLKERNEL=
+NO_INSTALLEXTRAKERNELS=yes
.for _kernel in ${KERNCONF}
.if exists(${KERNCONFDIR}/${_kernel})
BUILDKERNELS+= ${_kernel}
@@ -1102,7 +1103,7 @@ reinstallkernel reinstallkernel.debug: _installche
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${_kernel}"
@@ -1131,7 +1132,7 @@ distributekernel distributekernel.debug:
sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
${DESTDIR}/${DISTDIR}/kernel.meta
.endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
.if defined(NO_ROOT)
echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
@@ -1155,7 +1156,7 @@ packagekernel:
cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
@@ -1166,7 +1167,7 @@ packagekernel:
cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvf - . | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - . | \
--+ts6NCQ4mrNQIV8p--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160106212649.GD5169>