Page MenuHomeFreeBSD
Files F156607869

D42893.id.diff
No OneTemporary
Actions

D42893.id.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1827,6 +1827,12 @@
#
# Install the kernel defined by INSTALLKERNEL
#
+.if defined(PACKAGE_BUILDING)
+_instkernel=${INSTALLKERNEL}.${INSTKERNNAME}
+.else
+_instkernel=${INSTKERNNAME}
+.endif
+
installkernel installkernel.debug \
reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
.if !defined(NO_INSTALLKERNEL)
@@ -1839,9 +1845,9 @@
@echo "--------------------------------------------------------------"
${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH:Q} \
- ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+ ${MAKE} ${IMAKE_INSTALL} KERNEL=${_instkernel} ${.TARGET:S/kernel//}
@echo "--------------------------------------------------------------"
- @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)"
+ @echo ">>> Installing kernel ${_instkernel} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------"
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
@@ -1871,10 +1877,10 @@
${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
${IMAKE_MTREE} PATH=${TMPPATH:Q} ${MAKE} KERNEL=${INSTKERNNAME} \
- DESTDIR=${INSTALL_DDIR}/kernel \
+ DESTDIR=${INSTALL_DDIR}/${_instkernel} \
${.TARGET:S/distributekernel/install/}
.if defined(NO_ROOT)
- @sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
+ @sed -e 's|^./${_instkernel}|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
${DESTDIR}/${DISTDIR}/kernel.meta
.endif
.endif

File Metadata

Mime Type
text/plain
Expires
Sat, May 16, 2:13 AM (6 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33107440
Default Alt Text
D42893.id.diff (1 KB)

Event Timeline