Date: Thu, 09 Mar 2006 22:21:51 +1300 From: Andrew Turner <andrew@fubar.geek.nz> To: Sam Leffler <sam@freebsd.org> 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 ... Message-ID: <440FF3AF.6060305@fubar.geek.nz> In-Reply-To: <200603081802.k28I2WGR024431@repoman.freebsd.org> References: <200603081802.k28I2WGR024431@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <arch>/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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?440FF3AF.6060305>