From owner-cvs-src@FreeBSD.ORG Thu Mar 9 09:21:57 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 026A216A420; Thu, 9 Mar 2006 09:21:57 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from avmta3-rme.xtra.co.nz (avmta3-rme.xtra.co.nz [210.86.15.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ACBF43D45; Thu, 9 Mar 2006 09:21:54 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from mta3-rme.xtra.co.nz ([210.86.15.140]) by avmta3-rme.xtra.co.nz with ESMTP id <20060309092153.YCGH16058.avmta3-rme.xtra.co.nz@mta3-rme.xtra.co.nz>; Thu, 9 Mar 2006 22:21:53 +1300 Received: from serv.int.fubar.geek.nz ([222.153.178.159]) by mta3-rme.xtra.co.nz with ESMTP id <20060309092152.LHKL14226.mta3-rme.xtra.co.nz@serv.int.fubar.geek.nz>; Thu, 9 Mar 2006 22:21:52 +1300 Received: from [192.168.1.10] (unknown [192.168.1.10]) by serv.int.fubar.geek.nz (Postfix) with ESMTP id CCEA9613C; Fri, 10 Mar 2006 11:21:56 +1300 (NZDT) Message-ID: <440FF3AF.6060305@fubar.geek.nz> Date: Thu, 09 Mar 2006 22:21:51 +1300 From: Andrew Turner User-Agent: Thunderbird 1.5 (X11/20060213) MIME-Version: 1.0 To: Sam Leffler References: <200603081802.k28I2WGR024431@repoman.freebsd.org> In-Reply-To: <200603081802.k28I2WGR024431@repoman.freebsd.org> Content-Type: multipart/mixed; boundary="------------090506060306070909090109" Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/release Makefile src/release/amd64 boot_crunch.conf src/release/i386 boot_crunch.conf src/release/ia64 boot_crunch.conf src/release/pc98 boot_crunch.conf src/usr.sbin/sysinstall Makefile acpi.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 09:21:57 -0000 This is a multi-part message in MIME format. --------------090506060306070909090109 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sam Leffler wrote: > Log: > Revamp base system packaging of kernels to enable up/smp selection > at runtime and to support distributing additional kernels: > o remove kernel from the base tarball > o add new kernel tarballs > o build + package both SMP and GENERIC kernels when an /conf/SMP > config file is present > > This breaks when KERNELS is already defined. The documented behavior is to build GENERIC and any other kernels from the KERNELS define. The attached untested patch will fix this and also builds the SMP kernel if it can. Andrew --------------090506060306070909090109 Content-Type: text/x-patch; name="freebsd_release_Makefile.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="freebsd_release_Makefile.diff" Index: release/Makefile =================================================================== RCS file: /cvsroot/src/release/Makefile,v retrieving revision 1.900 diff -u -3 -p -u -r1.900 Makefile --- release/Makefile 8 Mar 2006 18:02:30 -0000 1.900 +++ release/Makefile 9 Mar 2006 22:18:22 -0000 @@ -178,9 +178,9 @@ DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DI # has both configuration files. Otherwise only GENERIC is done. # .if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) -KERNELS?= GENERIC +KERNELL+= GENERIC .else -KERNELS?= GENERIC SMP +KERNELS+= GENERIC SMP .endif # mountpoint for filesystems. --------------090506060306070909090109--