Attachment 203007 Details for Bug 236658 – Makefile.inc1 - introduction of USERKERNNAME - U20

[patch] Makefile.inc1 - introduction of USERKERNNAME - U20

Makefile.inc1.diff (text/plain), 4.81 KB, created by Lorenzo Salvadore on 2019-03-20 16:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lorenzo Salvadore

Created: 2019-03-20 16:30:00 UTC

Size: 4.81 KB

patch

obsolete

>Index: Makefile.inc1
>===================================================================
>--- Makefile.inc1	(revision 345323)
>+++ Makefile.inc1	(working copy)
>@@ -1532,40 +1532,41 @@
> # Note that we have to use TARGET instead of TARGET_ARCH when
> # we're in kernel-land. Since only TARGET_ARCH is (expected) to
> # be set to cross-build, we have to make sure TARGET is set
> # properly.
> 
> .if defined(KERNFAST)
> NO_KERNELCLEAN=	t
> NO_KERNELCONFIG=	t
> NO_KERNELOBJ=		t
> # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
> .if !defined(KERNCONF) && ${KERNFAST} != "1"
> KERNCONF=${KERNFAST}
> .endif
> .endif
> .if ${TARGET_ARCH} == "powerpc64"
> KERNCONF?=	GENERIC64
> .else
> KERNCONF?=	GENERIC
> .endif
> INSTKERNNAME?=	kernel
>+USEKERNNAME?=	yes
> 
> KERNSRCDIR?=	${.CURDIR}/sys
> KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
> KRNLOBJDIR=	${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,}
> KERNCONFDIR?=	${KRNLCONFDIR}
> 
> BUILDKERNELS=
> INSTALLKERNEL=
> .if defined(NO_INSTALLKERNEL)
> # All of the BUILDKERNELS loops start at index 1.
> BUILDKERNELS+= dummy
> .endif
> .for _kernel in ${KERNCONF}
> .if !defined(_MKSHOWCONFIG) && exists(${KERNCONFDIR}/${_kernel})
> BUILDKERNELS+=	${_kernel}
> .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
> INSTALLKERNEL= ${_kernel}
> .endif
> .else
> .if make(buildkernel)
>@@ -1644,68 +1645,82 @@
> 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
> 	@echo "--------------------------------------------------------------"
> 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
> 	@echo "--------------------------------------------------------------"
> 	
> .endfor
> 	@seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \
> 	  echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \
> 	  echo "ncpu: $$(sysctl -n hw.ncpu)${.MAKE.JOBS:S/^/, make -j/}"
> 	@echo "--------------------------------------------------------------"
> 
> NO_INSTALLEXTRAKERNELS?=	yes
> 
> #
> # installkernel, etc.
> #
> # Install the kernel defined by INSTALLKERNEL
> #
> installkernel installkernel.debug \
> reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
>+.if ${USEKERNNAME} == yes
> .if !defined(NO_INSTALLKERNEL)
> .if empty(INSTALLKERNEL)
> 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
> 	false
> .endif
> 	@echo "--------------------------------------------------------------"
> 	@echo ">>> Installing kernel ${INSTALLKERNEL} on $$(LC_ALL=C date)"
> 	@echo "--------------------------------------------------------------"
> 	${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> 	    ${CROSSENV} PATH=${TMPPATH} \
> 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
> 	@echo "--------------------------------------------------------------"
> 	@echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)"
> 	@echo "--------------------------------------------------------------"
> .endif
> .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
> .for _kernel in ${BUILDKERNELS:[2..-1]}
> 	@echo "--------------------------------------------------------------"
> 	@echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)"
> 	@echo "--------------------------------------------------------------"
> 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; \
> 	    ${CROSSENV} PATH=${TMPPATH} \
> 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//}
> 	@echo "--------------------------------------------------------------"
> 	@echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)"
> 	@echo "--------------------------------------------------------------"
> .endfor
> .endif
>+.else
>+.for _kernel in ${BUILDKERNELS}
>+	@echo "--------------------------------------------------------------"
>+	@echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)"
>+	@echo "--------------------------------------------------------------"
>+	${_+_}cd ${KRNLOBJDIR}/${_kernel}; \
>+	    ${CROSSENV} PATH=${TMPPATH} \
>+	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${_kernel} ${.TARGET:S/kernel//}
>+	@echo "--------------------------------------------------------------"
>+	@echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)"
>+	@echo "--------------------------------------------------------------"
>+.endfor
>+.endif
> 
> distributekernel distributekernel.debug: .PHONY
> .if !defined(NO_INSTALLKERNEL)
> .if empty(INSTALLKERNEL)
> 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
> 	false
> .endif
> 	mkdir -p ${DESTDIR}/${DISTDIR}
> .if defined(NO_ROOT)
> 	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
> .endif
> 	${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
> 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
> 	    DESTDIR=${INSTALL_DDIR}/kernel \
> 	    ${.TARGET:S/distributekernel/install/}
> .if defined(NO_ROOT)
> 	@sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
> 	    ${DESTDIR}/${DISTDIR}/kernel.meta
> .endif

Actions: View | Diff

Attachments on bug 236658: 202999 | 203007