Attachment 8449 Details for Bug 17698 – file.diff

[patch] file.diff

file.diff (text/plain), 2.40 KB, created by k on 2000-03-30 21:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: k

Created: 2000-03-30 21:50:01 UTC

Size: 2.40 KB

patch

obsolete

>--- Makefile.inc1.orig	Thu Mar 30 20:10:14 2000
>+++ Makefile.inc1	Thu Mar 30 22:39:13 2000
>@@ -339,6 +339,7 @@
> # properly.
> 
> KERNEL?=	GENERIC GENERIC98
>+INSTKERNEL?=	kernel
> 
> # The only exotic MACHINE_ARCH/MACHINE combination valid at this
> # time is i386/pc98. In all other cases set MACHINE equal to
>@@ -357,11 +358,14 @@
> 
> BUILDKERNELS=
> INSTALLKERNEL=
>+INSTALLKERNELS=
> .for _kernel in ${KERNEL}
> .if exists(${KRNLCONFDIR}/${_kernel})
> BUILDKERNELS+=	${_kernel}
> .if empty(INSTALLKERNEL)
> INSTALLKERNEL= ${_kernel}
>+.else
>+INSTALLKERNELS+= ${_kernel}
> .endif
> .endif
> .endfor
>@@ -392,12 +396,25 @@
> #
> # installkernel
> #
>-# Install the kernel defined by INSTALLKERNEL
>+# Install the kernel defined by INSTALLKERNEL and INSTALLKERNELS
> #
> installkernel:
>+	@echo
>+	@echo "--------------------------------------------------------------"
>+	@echo ">>> Installing kernel(s)"
>+	@echo "--------------------------------------------------------------"
>+	@echo "===> ${INSTALLKERNEL} as ${DESTDIR}/${INSTKERNEL}"
> 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
> 		${IMAKEENV} MACHINE=${MACHINE} KERNEL=${INSTALLKERNEL} \
>-		    ${MAKE} install
>+		    INSTKERNEL=${INSTKERNEL} ${MAKE} install
>+.for _kernel in ${INSTALLKERNELS}
>+	@echo "===> ${_kernel} as ${DESTDIR}/${INSTKERNEL}.${_kernel}"
>+	cd ${KRNLOBJDIR}/${_kernel}; \
>+		${IMAKEENV} MACHINE=${MACHINE} KERNEL=${_kernel} \
>+		    INSTKERNEL=${INSTKERNEL}.${_kernel} ${MAKE} install
>+.endfor	
>+
>+
> 
> #
> # update
>--- sys/conf/Makefile.i386.orig	Thu Mar 30 21:26:22 2000
>+++ sys/conf/Makefile.i386	Thu Mar 30 20:59:19 2000
>@@ -21,6 +21,7 @@
> 
> # Can be overridden by makeoptions or /etc/make.conf
> KERNEL?=	kernel
>+INSTKERNEL?=	${KERNEL}
> STD8X16FONT?=	iso
> 
> .if !defined(S)
>@@ -197,16 +198,16 @@
> 		echo "You must build a kernel first." ; \
> 		exit 1 ; \
> 	fi
>-.if exists(${DESTDIR}/${KERNEL})
>-	-chflags noschg ${DESTDIR}/${KERNEL}
>-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
>+.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}/${KERNEL}
>+		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${INSTKERNEL}
> 
> reinstall reinstall.debug:
> 	install -c -m 555 -o root -g wheel -fschg \
>-		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
>+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${INSTKERNEL}
> 
> config.o:
> 	${NORMAL_C}

Actions: View | Diff

Attachments on bug 17698: 8449