Attachment #8449 for bug #17698

View | Details | Raw Unified | Return to bug 17698
Collapse All | Expand All

Lines 339-344 Link Here

(-)Makefile.inc1 (-2 / +19 lines)
339	# properly.	339	# properly.
340		340
341	KERNEL?= GENERIC GENERIC98	341	KERNEL?= GENERIC GENERIC98
		342	INSTKERNEL?= kernel
342		343
343	# The only exotic MACHINE_ARCH/MACHINE combination valid at this	344	# The only exotic MACHINE_ARCH/MACHINE combination valid at this
344	# time is i386/pc98. In all other cases set MACHINE equal to	345	# time is i386/pc98. In all other cases set MACHINE equal to
Lines 357-367 Link Here
357		358
358	BUILDKERNELS=	359	BUILDKERNELS=
359	INSTALLKERNEL=	360	INSTALLKERNEL=
		361	INSTALLKERNELS=
360	.for _kernel in ${KERNEL}	362	.for _kernel in ${KERNEL}
361	.if exists(${KRNLCONFDIR}/${_kernel})	363	.if exists(${KRNLCONFDIR}/${_kernel})
362	BUILDKERNELS+= ${_kernel}	364	BUILDKERNELS+= ${_kernel}
363	.if empty(INSTALLKERNEL)	365	.if empty(INSTALLKERNEL)
364	INSTALLKERNEL= ${_kernel}	366	INSTALLKERNEL= ${_kernel}
		367	.else
		368	INSTALLKERNELS+= ${_kernel}
365	.endif	369	.endif
366	.endif	370	.endif
367	.endfor	371	.endfor
Lines 392-403 Link Here
392	#	396	#
393	# installkernel	397	# installkernel
394	#	398	#
395	# Install the kernel defined by INSTALLKERNEL	399	# Install the kernel defined by INSTALLKERNEL and INSTALLKERNELS
396	#	400	#
397	installkernel:	401	installkernel:
		402	@echo
		403	@echo "--------------------------------------------------------------"
		404	@echo ">>> Installing kernel(s)"
		405	@echo "--------------------------------------------------------------"
		406	@echo "===> ${INSTALLKERNEL} as ${DESTDIR}/${INSTKERNEL}"
398	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \	407	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
399	${IMAKEENV} MACHINE=${MACHINE} KERNEL=${INSTALLKERNEL} \	408	${IMAKEENV} MACHINE=${MACHINE} KERNEL=${INSTALLKERNEL} \
400	${MAKE} install	409	INSTKERNEL=${INSTKERNEL} ${MAKE} install
		410	.for _kernel in ${INSTALLKERNELS}
		411	@echo "===> ${_kernel} as ${DESTDIR}/${INSTKERNEL}.${_kernel}"
		412	cd ${KRNLOBJDIR}/${_kernel}; \
		413	${IMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} \
		414	INSTKERNEL=${INSTKERNEL}.${_kernel} ${MAKE} install
		415	.endfor
		416
		417
401		418
402	#	419	#
403	# update	420	# update





# Can be overridden by makeoptions or /etc/make.conf
KERNEL?=	kernel
INSTKERNEL?=	${KERNEL}
STD8X16FONT?=	iso

.if !defined(S)

		echo "You must build a kernel first." ; \
		exit 1 ; \
	fi
.if exists(${DESTDIR}/${INSTKERNEL})
	-chflags noschg ${DESTDIR}/${INSTKERNEL}
	mv ${DESTDIR}/${INSTKERNEL} ${DESTDIR}/${INSTKERNEL}.old
.endif
	install -c -m 555 -o root -g wheel -fschg \
		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${INSTKERNEL}

reinstall reinstall.debug:
	install -c -m 555 -o root -g wheel -fschg \
		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${INSTKERNEL}

config.o:
	${NORMAL_C}

Return to bug 17698

Lines 21-26 Link Here

(-)sys/conf/Makefile.i386 (-5 / +6 lines)
21		21
22	# Can be overridden by makeoptions or /etc/make.conf	22	# Can be overridden by makeoptions or /etc/make.conf
23	KERNEL?= kernel	23	KERNEL?= kernel
		24	INSTKERNEL?= ${KERNEL}
24	STD8X16FONT?= iso	25	STD8X16FONT?= iso
25		26
26	.if !defined(S)	27	.if !defined(S)
Lines 197-212 Link Here
197	echo "You must build a kernel first." ; \	198	echo "You must build a kernel first." ; \
198	exit 1 ; \	199	exit 1 ; \
199	fi	200	fi
200	.if exists(${DESTDIR}/${KERNEL})	201	.if exists(${DESTDIR}/${INSTKERNEL})
201	-chflags noschg ${DESTDIR}/${KERNEL}	202	-chflags noschg ${DESTDIR}/${INSTKERNEL}
202	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old	203	mv ${DESTDIR}/${INSTKERNEL} ${DESTDIR}/${INSTKERNEL}.old
203	.endif	204	.endif
204	install -c -m 555 -o root -g wheel -fschg \	205	install -c -m 555 -o root -g wheel -fschg \
205	${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}	206	${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${INSTKERNEL}
206		207
207	reinstall reinstall.debug:	208	reinstall reinstall.debug:
208	install -c -m 555 -o root -g wheel -fschg \	209	install -c -m 555 -o root -g wheel -fschg \
209	${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}	210	${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${INSTKERNEL}
210		211
211	config.o:	212	config.o:
212	${NORMAL_C}	213	${NORMAL_C}