From owner-freebsd-bugs  Mon Jul 31 13:20:10 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id C577D37BCE3
	for <freebsd-bugs@FreeBSD.org>; Mon, 31 Jul 2000 13:20:00 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA82339;
	Mon, 31 Jul 2000 13:20:00 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from numeri.campus.luth.se (numeri.campus.luth.se [130.240.197.103])
	by hub.freebsd.org (Postfix) with ESMTP id 02D6937BCCE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 31 Jul 2000 13:18:10 -0700 (PDT)
	(envelope-from k@numeri.campus.luth.se)
Received: (from k@localhost)
	by numeri.campus.luth.se (8.9.3/8.9.3) id WAA04141;
	Mon, 31 Jul 2000 22:18:32 +0200 (CEST)
	(envelope-from k)
Message-Id: <200007312018.WAA04141@numeri.campus.luth.se>
Date: Mon, 31 Jul 2000 22:18:32 +0200 (CEST)
From: Johan Karlsson <k@numeri.campus.luth.se>
Reply-To: k@numeri.campus.luth.se
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: misc/20325: [PATCH] allow KERNEL to be set in make.conf when using build/installkernel
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20325
>Category:       misc
>Synopsis:       [PATCH] allow KERNEL to be set in make.conf when using build/installkernel
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 31 13:20:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Johan Karlsson
>Release:        FreeBSD 4.1-STABLE i386
>Organization:
>Environment:

src/Makefile.inc1:
     $FreeBSD: src/Makefile.inc1,v 1.163 2000/07/23 21:30:35 marcel Exp $

>Description:

	If one sets KERNEL=FOO in /etc/make.conf the build/install-kernel targets 
	of src/Makefile.inc1 while create/install a kernel called 'FOO'.
	
	From cvs log, i belive marcels intent was to still name it 'kernel'
==
1.162 Sun Jul 23 17:38:32 2000 UTC by marcel 
Diffs to 1.161 

Name all kernels 'kernel'. This fixes the incompatible behaviour
of the buildkernel and installkernel targets where the kernel
was called after the config name.
==

	This was in a way fixed in 1.150 but reverted by accident in 1.162


>How-To-Repeat:
	
	#echo 'KERNEL=GENERIC' >> /etc/make.conf
	#cd /usr/src/
	#make buildkernel

	and see it link a kernel called 'GENERIC'

	#make installkernel

	and see it install as 'GENERIC'

>Fix:

Index: Makefile.inc1
===================================================================
RCS file: /host/queeg.ludd/FreeBSD-mirror/ncvs/src/Makefile.inc1,v
retrieving revision 1.163
diff -u -r1.163 Makefile.inc1
--- Makefile.inc1	2000/07/23 21:30:35	1.163
+++ Makefile.inc1	2000/07/31 18:53:58
@@ -403,10 +403,10 @@
 		    ${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/Makefile
 .if !defined(NO_KERNELDEPEND)
 	cd ${KRNLOBJDIR}/${_kernel}; \
-		${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} depend
+		${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel depend
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-		${WMAKEENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} all
+		${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel all
 .endfor
 
 #
@@ -416,7 +416,7 @@
 #
 installkernel:
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
-		${CROSSENV} MACHINE=${MACHINE} KERNEL=kernel ${MAKE} install
+		${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel install
 
 #
 # update



>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message