From nobody@FreeBSD.org Fri Oct 27 08:11:18 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDE3716A412 for ; Fri, 27 Oct 2006 08:11:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADF4343D45 for ; Fri, 27 Oct 2006 08:11:18 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k9R8BHYR068512 for ; Fri, 27 Oct 2006 08:11:17 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k9R8BGVP068511; Fri, 27 Oct 2006 08:11:16 GMT (envelope-from nobody) Message-Id: <200610270811.k9R8BGVP068511@www.freebsd.org> Date: Fri, 27 Oct 2006 08:11:16 GMT From: Helmut Schneider To: freebsd-gnats-submit@FreeBSD.org Subject: "make release" custom kernel unsuccessful X-Send-Pr-Version: www-3.0 >Number: 104854 >Category: misc >Synopsis: "make release" custom kernel unsuccessful >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 27 08:20:19 GMT 2006 >Closed-Date: Fri Oct 27 09:01:52 GMT 2006 >Last-Modified: Fri Oct 27 09:01:52 GMT 2006 >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@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@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@orakel /usr/src/release]# >Release-Note: >Audit-Trail: State-Changed-From-To: open->closed State-Changed-By: ru State-Changed-When: Fri Oct 27 08:59:59 UTC 2006 State-Changed-Why: This behavior is by design; custom kernels are still available and can be booted off. Here's what the release(7) manpage says about: : KERNELS Specifies a list of additional kernel configura- : tions to compile and install into the ``base'' dis- : tribution. Each kernel is installed into : /boot/ so that it can be booted from the : loader via ``boot ''. http://www.freebsd.org/cgi/query-pr.cgi?pr=104854 >Unformatted: