misc/104854: "make release" custom kernel unsuccessful

[Helmut Schneider]

>Number:         104854
>Category:       misc
>Synopsis:       "make release" custom kernel unsuccessful
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 27 08:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Helmut Schneider
>Release:        6.1
>Organization:
>Environment:
FreeBSD orakel.v-pe.de 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Fri Oct 20 16:39:06 CEST 2006     root at orakel.v-pe.de:/usr/obj/usr/src/sys/IBM_HS20_SMP  i386
>Description:
Doing a "make release" with a custom kernel fails because when creating boot images the GENERIC kernel is copied instead of the custom kernel.
>How-To-Repeat:
make CHROOTDIR=/home/release CVSROOT=/usr BUILDNAME=6.1-RELEASE RELEASETAG=RELENG_6_1 EXTPORTSDIR=/usr/ports EXTSRCDIR=/usr/src KERNELS_BASE=IBM_HS20_SMP KERNELS=IBM_HS20_SMP NODOC=YES NOPORTS=YES MAKE_ISOS=YES release
>Fix:
Just a suggestion, I did not fully test that, but it seems to work... :)

[root at orakel /usr/src/release]# diff Makefile.org Makefile
806c806
<       @gzip -9nc ${RD}/kernels/GENERIC/kernel > ${RD}/kernels/kernel.gz
---
>       @gzip -9nc ${RD}/kernels/$(KERNELS)/kernel > ${RD}/kernels/kernel.gz
936,937c936,937
<       @echo "Copy GENERIC kernel to boot area"
<       @cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel
---
>       @echo "Copy kernel to boot area"
>       @cp -Rp ${RD}/kernels/$(KENRELS)/ ${CD_LIVEFS}/boot/kernel
1226c1226
< ACPI_KO=      ${RD}/kernels/GENERIC/acpi.ko
---
> ACPI_KO=      ${RD}/kernels/$(KERNELS)/acpi.ko
[root at orakel /usr/src/release]#
>Release-Note:
>Audit-Trail:
>Unformatted: