From owner-p4-projects@FreeBSD.ORG Thu Mar 9 06:08:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A988916A423; Thu, 9 Mar 2006 06:08:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D89A16A420 for ; Thu, 9 Mar 2006 06:08:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29C5E43D45 for ; Thu, 9 Mar 2006 06:08:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2968twA063102 for ; Thu, 9 Mar 2006 06:08:55 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2968sov063099 for perforce@freebsd.org; Thu, 9 Mar 2006 06:08:54 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 9 Mar 2006 06:08:54 GMT Message-Id: <200603090608.k2968sov063099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 06:08:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=93016 Change 93016 by soc-andrew@soc-andrew_serv on 2006/03/09 06:08:44 Integrate the release changes Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#35 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/kernels-install.sh#1 branch Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.899 2006/02/08 11:18:29 hrs Exp $ +# $FreeBSD: src/release/Makefile,v 1.900 2006/03/08 18:02:30 sam Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -173,6 +173,16 @@ .endif DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} +# +# Build and package both GENERIC and SMP kernels if the target +# has both configuration files. Otherwise only GENERIC is done. +# +.if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) +KERNELS?= GENERIC +.else +KERNELS?= GENERIC SMP +.endif + # mountpoint for filesystems. MNT= /mnt @@ -567,7 +577,6 @@ mkdir ${RD}/floppies .endif mkdir ${RD}/trees - mkdir ${RD}/kernels for i in ${DISTRIBUTIONS}; do \ mkdir ${RD}/trees/$$i && \ mtree -deU -f ${MTREEFILES}/BSD.root.dist \ @@ -579,6 +588,10 @@ mtree -deU -f ${MTREEFILES}/BSD.var.dist \ -p ${RD}/trees/$$i/var > /dev/null ; \ done + mkdir ${RD}/kernels + for i in ${KERNELS}; do \ + mkdir ${RD}/kernels/$${i}; \ + done touch ${.TARGET} # Install the system into the various distributions. @@ -592,15 +605,10 @@ release.3: .for kernel in ${KERNELS} cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ - KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \ - DESTDIR=${RD}/trees/base + ${CROSSMAKE} ${KERNEL_FLAGS} \ + KERNCONF=${kernel} kernel \ + DESTDIR=${RD}/kernels KODIR=/${kernel} .endfor - # Install a standard boot kernel+modules. - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${KERNEL_FLAGS} \ - kernel \ - DESTDIR=${RD}/trees/base touch ${.TARGET} # Make and install the three crunched binaries which live on the floppies. @@ -658,6 +666,15 @@ echo "$${i} distribution is finished."; \ fi ; \ done + @for i in ${KERNELS} ; \ + do \ + if [ -d ${RD}/kernels/$${i} ] ; then \ + cd ${.CURDIR} && $(MAKE) doTARBALL \ + SD=${RD}/kernels \ + TN=$$i TD=kernels ARG="$$i" && \ + echo "$${i} distribution is finished."; \ + fi ; \ + done .if !defined(NOPORTS) # XXX: Inline stripped version of doTARBALL @rm -rf ${RD}/dists/ports/ports* @@ -846,7 +863,7 @@ # Build boot and install floppies. floppies.1: - @gzip -9nc ${RD}/trees/base/boot/kernel/kernel > ${RD}/kernels/kernel.gz + @gzip -9nc ${RD}/kernels/GENERIC/kernel > ${RD}/kernels/kernel.gz @echo "Making the kernel boot floppies..." @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=kern \ FLOPPYDESC="Kernel" SPLITFILE=${RD}/kernels/kernel.gz @@ -977,6 +994,8 @@ find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \ fi \ done + @echo "Copy GENERIC kernel to boot area" + @cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel .else # Setup the CD's contents @rm -fr ${CD_LIVEFS}/boot ==== //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.60 2005/12/15 01:04:49 iedowse Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -41,4 +41,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/errata/article.sgml#4 (text+ko) ==== @@ -40,7 +40,7 @@ The &os; Project - $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.4 2006/03/05 15:07:55 delphij Exp $ + $FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.5 2006/03/07 02:29:21 delphij Exp $ 2000 @@ -61,7 +61,7 @@ - 这份文档列出了 for &os; + 这份文档列出了 &os; @@ -71,7 +71,7 @@ - 的勘误内容， 的勘误内容， + 的勘误内容， 其中包括在发行版发布之后发现的重大问题， 以及在发行版的交付工程后期本应写进发行版文档， 而没有来得及加入的重要信息。 这些信息可能包括安全公告， ==== //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.60 2005/12/15 01:04:50 iedowse Exp $ +# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -41,4 +41,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.10 2005/12/15 01:04:50 iedowse Exp $ +# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.11 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -43,4 +43,4 @@ progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo ==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.60 2005/09/27 13:10:23 nyan Exp $ +# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -40,4 +40,4 @@ progs sysinstall libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo