Name all kernels 'kernel'. This fixes the incompatible behaviour
of the buildkernel and installkernel targets where the kernel was called after the config name. While here, fix the brokenness of the installkernel target. It used to use ${IMAKEENV}, but since that has a very restricted PATH, it couldn't find make(1). Use ${CROSSENV} instead.
This commit is contained in:
parent
03567510a8
commit
dce97721ea
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=63779
@ -403,11 +403,10 @@ buildkernel:
|
||||
${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/Makefile
|
||||
.if !defined(NO_KERNELDEPEND)
|
||||
cd ${KRNLOBJDIR}/${_kernel}; \
|
||||
${WMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} \
|
||||
${MAKE} depend
|
||||
${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} depend
|
||||
.endif
|
||||
cd ${KRNLOBJDIR}/${_kernel}; \
|
||||
${WMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} ${MAKE} all
|
||||
${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} all
|
||||
.endfor
|
||||
|
||||
#
|
||||
@ -417,8 +416,7 @@ buildkernel:
|
||||
#
|
||||
installkernel:
|
||||
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
|
||||
${IMAKEENV} MACHINE=${MACHINE} KERNEL=${INSTALLKERNEL} \
|
||||
${MAKE} KERNEL=${INSTALLKERNEL} install
|
||||
${CROSSENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} install
|
||||
|
||||
#
|
||||
# update
|
||||
|
Loading…
Reference in New Issue
Block a user