Author: nwhitehorn
Date: Mon Mar 14 13:47:17 2011
New Revision: 219641
URL: http://svn.freebsd.org/changeset/base/219641
Log:
Thanks to sysinstall for its 15 years of service. And now to sleep,
perchance to dream...
Added:
head/release/Makefile.sysinstall
- copied, changed from r219583, head/release/Makefile
Deleted:
head/release/Makefile.bsdinstall
Modified:
head/etc/motd
head/release/Makefile
head/release/generate-release.sh
Modified: head/etc/motd
==============================================================================
--- head/etc/motd Mon Mar 14 13:36:51 2011 (r219640)
+++ head/etc/motd Mon Mar 14 13:47:17 2011 (r219641)
@@ -19,6 +19,5 @@ as a question to the questions@FreeBSD.o
unfamiliar with FreeBSD's directory layout, please refer to the hier(7)
manual page. If you are not familiar with manual pages, type `man man'.
-You may also use sysinstall(8) to re-enter the installation and
-configuration utility. Edit /etc/motd to change this login announcement.
+Edit /etc/motd to change this login announcement.
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Mon Mar 14 13:36:51 2011 (r219640)
+++ head/release/Makefile Mon Mar 14 13:47:17 2011 (r219641)
@@ -1,1442 +1,157 @@
# $FreeBSD$
#
-# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
-# [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \
-# [SVNBRANCH=some/branch]
+# Makefile for building releases and release media.
+#
+# User-driven targets:
+# cdrom: Builds release CD-ROM media (release.iso)
+# ftp: Sets up FTP distribution area (ftp)
+# release: Build all media and FTP distribution area
+#
+# Variables affecting the build process:
+# WORLDDIR: location of src tree -- must have built world and default kernel
+# (by default, the directory above this one)
+# PORTSDIR: location of ports tree to distribute (default: /usr/ports)
+# DOCDIR: location of doc tree (default: /usr/doc)
+# NOPORTS: if set, do not distribute ports tree
+# NOSRC: if set, do not distribute source tree
+# NODOC: if set, do not generate release documentation
+# TARGET/TARGET_ARCH: architecture of built release
#
-# Where "/some/dir" is the pathname of a directory on a some filesystem with
-# at least 1000MB of free space, "somename" is what you want the release to
-# call itself, "/cvs/dir" is where our source repo resides and, optionally,
-# which CVS "tag" name should be used when checking out the sources to build
-# the release (default is HEAD).
-#
-# Please note the support for building from SVN is preliminary and there
-# are still questions about things like how to handle updates of
-# /usr/src on production systems (csup(1) replacement). It is a work
-# in progress and may change as the other issues get worked out.
-#
-# Please note: the md(4) driver must be present in the kernel
-# (either by being compiled in or available as a kld(4) module),
-# otherwise the target 'release.8' and possibly others will fail.
-#
-# Note: If you add options to this file, please keep release(7) updated!
-#
-# Set these, release builder!
-#
-# Fixed version:
-#BUILDNAME=9.0-CURRENT
-#
-# Automatic SNAP versioning:
-DATE != date +%Y%m%d
-BASE = 9.0
-BUILDNAME?=${BASE}-${DATE}-SNAP
-#
-#CHROOTDIR=/junk/release
-# If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_8
-#
-# To test a release with a source tree containing patches and
-# other work. This tree will get copied instead of getting the
-# src/ tree from a CVS checkout. For "rerelease", this will NOT
-# be copied; cvs update will be used instead.
-#EXTSRCDIR=/usr/src
-#
-# To use a checked-out ports collection directory instead of
-# checking out from a local CVS repository, set this option.
-#EXTPORTSDIR=/usr/ports
-#
-# To use a checked-out doc/ directory instead of
-# checking out from a local CVS repository, set this option.
-#EXTDOCDIR=/usr/doc
-#
-# To add other options to the CVS subcommands (co,up), set
-#CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'"
-#
-# To add other options to the CVS command, set
-#CVSARGS="-lfq"
-#
-# To prefix the CVS command
-#CVSPREFIX="/usr/bin/time"
-#
-# Where the CVS repository is
-#CVSROOT="/home/ncvs"
-#
-# To add other options to the Subversion subcommands (co,up), set
-#SVNCMDARGS="-r '{ 01/01/2002 00:00:00 UTC }'"
-#
-# To prefix the Subversion command
-#SVNPREFIX="/usr/bin/time"
-#
-# Where the Subversion repository is
-#SVNROOT=svn://svn.freebsd.org/base
-#
-# Subversion branch to build for src. If this is not set then it is
-# automatically computed from RELEASETAG.
-#SVNBRANCH=stable/8
-#
-# Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
-# are building an official release. Otherwise, we are building for
-# a branch.
-.if defined(RELEASETAG)
-ISRELEASE!= expr "${RELEASETAG}" : '^RELENG_.*_RELEASE$$' || true
-.if ${ISRELEASE} != 0
-# Convert "RELENG_ver_RELEASE" to "RELEASE_ver" for ports and doc trees.
-AUXRELEASETAG!= echo ${RELEASETAG} | sed -e 's/^RELENG_/RELEASE_/' -e
's/_RELEASE$$//'
-DOCRELEASETAG?= ${AUXRELEASETAG}
-PORTSRELEASETAG?= ${AUXRELEASETAG}
-.endif
-.endif
-# Determine the Subversion source branch that corresponds to the requested
-# RELEASETAG.
-.if !defined(SVNBRANCH)
-.if defined(RELEASETAG)
-SVNBRANCH!= echo "${RELEASETAG}" | awk -f ${.CURDIR}/svnbranch.awk
-.else
-SVNBRANCH= head
-.endif
-.endif
-
-# If you want to pass flags to the world build such as -j X, use
-# WORLD_FLAGS. Similarly, you can specify make flags for kernel
-# builds via KERNEL_FLAGS.
-#WORLD_FLAGS=-j4
-#KERNEL_FLAGS=-j4
+WORLDDIR?= ${.CURDIR}/..
+PORTSDIR?= /usr/ports
+DOCDIR?= /usr/doc
+RELNOTES_LANG?= en_US.ISO8859-1
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
-TARGET?= ${MACHINE}
-TARGET_CPUARCH?= ${MACHINE_CPUARCH}
-.else
-TARGET?= ${TARGET_ARCH}
-TARGET_CPUARCH?= ${TARGET_ARCH}
-.endif
-CROSSENV= TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
-CROSSMAKE= ${MAKE} ${CROSSENV}
-NATIVEMAKE= ${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE}
-
-# If you are using a local CVS repository with components stored in
-# non-standard modules, override these on the make commandline or
-# in the environment.
-RELEASESRCMODULE?= src
-RELEASEDOCMODULE?= doc
-RELEASEPORTSMODULE?= ports
-
-# Uncomment this to disable the doc.1 target. Docs normally require
-# the ports tree, so NOPORTS can be set together with NODOC in order
-# to have neither ports or docs. If only NOPORTS is set to YES, but
-# docs are still desired, the DOMINIMALDOCPORTS logic below will only
-# install the ports that are minimally required for the release note
documentation. This is
-# intended as a compromise, less disk space is required than for using
-# the entire ports collection (and much less time due to the huge number
-# of directories it would create), but still quite a bit as well as some
-# CPU cycles (some of the programs are C++, and things like ghostscript
-# belong to the required ports nevertheless).
-#
-#NODOC= YES
-#NOPORTS= YES
-
-# When retrieving ports using the pkg_add -r method, set your proxies to these.
-# src/release/${arch}/mkisoimages.sh can use these.
-#HTTP_PROXY?= www.example.com
-#FTP_PROXY?= ftp.example.com
-
-# When creating ISO images, point ${CD_PACKAGE_TREE} to a directory containing
-# the package split by an earlier invocation of the 'package-split' target.
-#CD_PACKAGE_TREE= /path/to/pkg
-
-# Extra source tarballs; each argument is a pair of source dir and
-# distribution name. The dist name should not exceed 7 characters
-# (another "s" for "source" will be prepended).
-#EXTRA_SRC= games/fortune fortune
-
-# Modify this definition if you want the release notes
-# and other release documentation in a language other than English.
-RELNOTES_LANG?= en_US.ISO8859-1
-
-# As an alternative to installing the entire ports collection (which
-# can take a huge amount of time, in particular on slower disks),
-# setting ${MINIMALDOCPORTS} allows to install and build just those
-# ports that are really required for getting the docs up & running.
-.if defined(NOPORTS) && !defined(NODOC)
-DOMINIMALDOCPORTS= YES
-.include "Makefile.inc.docports"
-RELEASEPORTSMODULE= ${MINIMALDOCPORTS} ports/sysutils/cdrtools
-.endif
-
-# Helper variable
-.if defined(NOPORTS)
-.if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES"
-NOPORTSATALL= YES
-.endif
-.endif
-
-#
-# Doing 'make index' in /usr/ports requires Perl.
-MAKEINDEXPORTS= lang/perl5.10
-DOCPORTS= textproc/docproj
-# Set this to wherever the distfiles required by release procedures.
-.if defined(DOCDISTFILES)
-# Respect DOCDISTFILES which is used before.
-RELEASEDISTFILES?= ${DOCDISTFILES}
-.else
-RELEASEDISTFILES?= ${.CURDIR}/../../ports/distfiles
-.endif
-# Set this to 1 if you want -P to be used for automatic keyboard detection
-# on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
-AUTO_KEYBOARD_DETECT?= 0
-
-.if !defined(NODOC)
-DIST_DOCS_ARCH_INDEP= hardware readme relnotes errata
-DIST_DOCS_ARCH_DEP=
-.endif
-
-# Things which without too much trouble can be considered variables
-# BASE_DISTS are special in that they get full /etc installation sets.
-#
-OTHER_DISTS?= catpages manpages proflibs dict info
-BASE_DISTS?= base doc games ${ARCH_DISTS}
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-ARCH_DISTS?= lib32
-.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 ${TARGET_ARCH} == "powerpc64"
-KERN_GENERIC?= GENERIC64
-.else
-KERN_GENERIC?= GENERIC
-.endif
-
-.if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP)
-KERNELS_BASE?= ${KERN_GENERIC} SMP
-.else
-KERNELS_BASE?= ${KERN_GENERIC}
-.endif
-
-# mountpoint for filesystems.
-MNT= /mnt
-
-# Various floppy image parameters.
-#
-
-.undef MAKE_FLOPPIES
-.if ${TARGET_ARCH} == "i386"
-MAKE_DVD=
-SEPARATE_LIVEFS=
-SPLIT_MFSROOT=
-.if ${TARGET} == "pc98"
-MAKE_FLOPPIES= true
-SMALLFLOPPYSIZE= 1200
-SMALLFLOPPYSPLITSIZE= 1152
-SMALLFLOPPYLABEL= fd1200
-SPLIT_MFSROOT=
-.endif
-FLOPPYSIZE= 1440
-FLOPPYSPLITSIZE= 1392
-FLOPPYINODE= 40000
-FLOPPYLABEL= fd1440
-BOOTINODE= 80000
-MFSSIZE= 4320
-MFSINODE= 8000
-MFSLABEL= minimum3
-.elif ${TARGET_ARCH} == "sparc64"
-DISKLABEL= sunlabel
-MAKE_DVD=
-MFSSIZE= 4096
-MFSINODE= 8192
-MFSLABEL= auto
-MINIROOT=
-SEPARATE_LIVEFS=
-.elif ${TARGET_ARCH} == "ia64"
-DISKLABEL= ""
-MAKE_DVD=
-MFSSIZE= 8192
-MFSINODE= 8192
-MFSLABEL= auto
-SEPARATE_LIVEFS=
-.elif ${TARGET_ARCH} == "amd64"
-MAKE_DVD=
-FLOPPYSIZE= 1440
-FLOPPYSPLITSIZE= 1392
-FLOPPYINODE= 40000
-FLOPPYLABEL= fd1440
-BOOTINODE= 80000
-MFSSIZE= 4096
-MFSINODE= 8192
-MFSLABEL= auto
-SEPARATE_LIVEFS=
-SPLIT_MFSROOT=
-.elif ${TARGET_ARCH} == "powerpc"
-DISKLABEL= ""
-MFSSIZE= 4096
-MFSINODE= 8192
-MFSLABEL= auto
-SEPARATE_LIVEFS=
-.elif ${TARGET_ARCH} == "powerpc64"
-DISKLABEL= ""
-MFSSIZE= 8192
-MFSINODE= 8192
-MFSLABEL= auto
-SEPARATE_LIVEFS=
-.endif
-.if defined(NO_FLOPPIES)
-.undef MAKE_FLOPPIES
-.endif
-
-.if exists(/sbin/bsdlabel)
-DISKLABEL?= bsdlabel
-.else
-DISKLABEL?= disklabel
-.endif
-
-ZIPPER= gzip -9 --no-name
-ZIPNSPLIT= ${ZIPPER} -c | split -b 1392k -
-
-# Things which may get you into trouble if you change them
-MTREEFILES= ${.CURDIR}/../etc/mtree
-_R?= /R
-RD= ${_R}/stage
-RND= ${RD}/release.doc
-FD= ${_R}/ftp
-CD= ${_R}/cdrom
-CD_BOOT= ${CD}/bootonly
-CD_DISC1= ${CD}/disc1
-CD_DISC2= ${CD}/disc2
-.if defined(MAKE_DVD)
-CD_DVD1= ${CD}/dvd1
-.endif
-.if !defined(NODOC)
-CD_DOCS= ${CD}/docs
-.endif
-.if defined(SEPARATE_LIVEFS)
-CD_LIVEFS= ${CD}/livefs
-.else
-CD_LIVEFS= ${CD_DISC1}
-.endif
-_MK?= ${CHROOTDIR}/mk
-
-# Where the bootstrap ports (see DOCPORTS) get installed.
-LOCALDIR= /usr/local/bin
-
-.if ${TARGET} != ${MACHINE} && ${DISKLABEL} == "bsdlabel"
-DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET}
-.else
-DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ""
-.endif
-
-CRUNCH_TARGETS= boot
-.if ${TARGET_ARCH} == "i386"
-CRUNCH_TARGETS+=fixit
-.if ${TARGET} == "pc98"
-CRUNCH_TARGETS+=fixit-small
-.endif
-.endif
-
-.if defined(MAKE_FLOPPIES)
-EXTRAS= floppies.1
-.if ${TARGET_ARCH} == "i386"
-EXTRAS+= floppies.2
-.endif
-EXTRAS+= floppies.3
-.endif
-EXTRAS+= ftp.1
-.if !defined(NOCDROM)
-EXTRAS+= cdrom.1 cdrom.2 cdrom.3
-.if defined(MAKE_ISOS)
-EXTRAS+= iso.1
-.endif
-.if ${TARGET} == "pc98"
-BOOTABLE="-G"
+TARGET?= ${MACHINE}
.else
-BOOTABLE="-b"
-.endif
+TARGET?= ${TARGET_ARCH}
.endif
+IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
+DISTDIR= ${.OBJDIR}/dist
-.if !defined(NODOC)
-DOCREL= doc.1 doc.2
-.endif
-
-.if !make(release) && !make(rerelease) && !make(package-split)
-BINMAKE!= cd ${.CURDIR}/..; ${MAKE} -V BINMAKE
-WMAKEENV!= cd ${.CURDIR}/..; \
- ${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV
-WMAKE= ${WMAKEENV} ${BINMAKE}
-.endif
-
-CVS_SRCARGS= -P
-.if defined(RELEASETAG)
-CVS_SRCARGS+= -r ${RELEASETAG}
-.endif
-
-CVS_DOCARGS= -P
-.if defined(DOCRELEASETAG)
-CVS_DOCARGS+= -r ${DOCRELEASETAG}
-.endif
-
-CVS_PORTSARGS= -P
-.if defined(PORTSRELEASETAG)
-CVS_PORTSARGS+= -r ${PORTSRELEASETAG}
-.endif
-
-WORLDDIR?= ${.CURDIR}/..
-
-release rerelease:
-.if !defined(CHROOTDIR) || !defined(BUILDNAME)
- @echo "To make a release you must set CHROOTDIR and BUILDNAME" && false
-.endif
-.if !defined(NOPORTSATALL) && !defined(EXTPORTSDIR) && !defined(CVSROOT)
- @echo "Building ports requires CVSROOT or EXTPORTSDIR" && false
+.if !exists(${DOCDIR})
+NODOC= true
.endif
-.if !defined(NODOC) && !defined(EXTDOCDIR) && !defined(CVSROOT)
- @echo "Building docs requires CVSROOT or EXTDOCDIR" && false
-.endif
-.if !defined(EXTSRCDIR) && !defined(CVSROOT) && !defined(SVNROOT)
- @echo "The source tree requires SVNROOT, CVSROOT, or EXTSRCDIR" && false
-.endif
-.if defined(NOPORTSATALL) && !defined(NODOC)
- @echo "Ports are required for building the release docs. Either set
NODOC or"
- @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
- @exit 1
-.endif
-.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES)
-.for p in ${LOCAL_PATCHES}
-.if !exists(${p})
- @echo "The patch file ${p} does not exist!"
- @exit 1
-.endif
-.endfor
-.endif
-.if defined(LOCAL_SCRIPT) && !exists(${LOCAL_SCRIPT})
- @echo "The local script ${LOCAL_SCRIPT} does not exist!"
- @exit 1
-.endif
-.if make(release)
-.if exists(${CHROOTDIR})
-# The first command will fail on a handful of files that have their schg
-# flags set. But it greatly speeds up the next two commands.
- # NB: clear any vestigial devfs mount, just in case
- -umount ${CHROOTDIR}/dev > /dev/null 2>&1
- -rm -rf ${CHROOTDIR} 2>/dev/null
- -chflags -R 0 ${CHROOTDIR}/.
- -rm -rf ${CHROOTDIR}
-.endif
- mkdir -p ${CHROOTDIR}
- @echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
- cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML
-DWITHOUT_LIB32 \
- -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE installworld
DESTDIR=${CHROOTDIR}
- cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
- if [ -f /etc/resolv.conf ]; then \
- cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
- fi
-.if defined(EXTLOCALDIR)
- rm -rf ${CHROOTDIR}/usr/local
- cd ${CHROOTDIR}/usr && cp -R -H ${EXTLOCALDIR} local
-.endif
- rm -rf ${CHROOTDIR}/usr/src
-.if defined(EXTSRCDIR)
- cd ${CHROOTDIR}/usr && \
- cp -R -H ${EXTSRCDIR} src
-.elif defined(SVNROOT)
- cd ${CHROOTDIR}/usr && \
- ${SVNPREFIX} svn co ${SVNCMDARGS} ${SVNROOT}/${SVNBRANCH} \
- ${RELEASESRCMODULE}
-.else
- cd ${CHROOTDIR}/usr && \
- ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
- co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE}
-.endif
-.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES)
-.for p in ${LOCAL_PATCHES}
- patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p}
-.endfor
-.endif
-.if defined(LOCAL_SCRIPT)
- cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} \
- RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT}
-.endif
- rm -rf ${CHROOTDIR}/usr/ports
-.if !defined(NOPORTSATALL)
-.if defined(EXTPORTSDIR)
- cd ${CHROOTDIR}/usr && cp -R -H ${EXTPORTSDIR} ports
- # If there are distfiles downloaded removing them
- rm -rf ports/distfiles/*
-.else
- cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
- co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE}
-.endif
-.endif
-.if !defined(NODOC)
- rm -rf ${CHROOTDIR}/usr/doc
-.if defined(EXTDOCDIR)
- cd ${CHROOTDIR}/usr && cp -R -H ${EXTDOCDIR} doc
-.else
- cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
- co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE}
-.endif
- if [ -d ${RELEASEDISTFILES}/ ]; then \
- cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
- else \
- mkdir -p ${CHROOTDIR}/usr/ports/distfiles; \
- fi
-.if !defined(NO_PREFETCHDISTFILES)
- @cd ${.CURDIR} && ${MAKE} fetch-distfiles
-.endif
-.endif
-.endif
-.if make(rerelease)
-.if !defined(RELEASENOUPDATE) && !defined(EXTSRCDIR)
-.if defined(SVNROOT)
- cd ${CHROOTDIR}/usr/src && ${SVNPREFIX} svn switch ${SVNCMDARGS} \
- ${SVNROOT}/${SVNBRANCH}
-.elif !defined(RELEASETAG)
- cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
- update ${CVSCMDARGS} -P -d -A
-.else
- cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
- update ${CVSCMDARGS} -P -d -r ${RELEASETAG}
-.endif
- rm -f ${CHROOTDIR}/tmp/.world_done
-.if !defined(NOPORTS) && !defined(EXTPORTSDIR)
- cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
- update ${CVSCMDARGS} -P -d
- rm -f ${CHROOTDIR}/tmp/.skip_ports_index
-.endif
-.if defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES"
- for i in ${MINIMALDOCPORTS}; do \
- ( cd ${CHROOTDIR}/usr/$$i && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
- update ${CVSCMDARGS} -P -d ) ; \
- done
-.endif
-.if !defined(NODOC)
- cd ${CHROOTDIR}/usr/doc && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
- update ${CVSCMDARGS} -P -d
-.endif
-.endif
-.endif
- # Add version information to those things that need it.
- if [ ! -f ${CHROOTDIR}/tmp/.world_done ]; then \
- cd ${CHROOTDIR}/usr/src/sys/conf && \
- mv newvers.sh foo && \
- sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh && \
- rm foo; \
- fi
- -test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release
- echo "#!/bin/sh" > ${_MK}
- echo "set -ex" >> ${_MK}
- echo "trap 'umount /dev || true' 0" >> ${_MK}
- echo "_RELTARGET=\$${1:-doRELEASE}" >> ${_MK}
-.for var in \
- AUTO_KEYBOARD_DETECT \
- BUILDNAME \
- CD_PACKAGE_TREE \
- DISTRIBUTIONS \
- DOMINIMALDOCPORTS \
- EXTRA_SRC \
- FTP_PASSIVE_MODE \
- FTP_PROXY \
- HTTP_PROXY \
- KERNELS \
- KERNELS_BASE \
- KERNEL_FLAGS \
- MAKE_DVD \
- MAKE_FLOPPIES \
- MAKE_ISOS \
- NOCDROM \
- NODOC \
- NOPORTS \
- NO_SHARED \
- NOSRC \
- NO_CPU_CFLAGS \
- NO_CPU_COPTFLAGS \
- NO_FLOPPIES \
- RELEASETAG \
- RELNOTES_LANG \
- SEPARATE_LIVEFS \
- TARGET \
- TARGET_ARCH \
- TARGET_CPUARCH \
- WORLD_FLAGS
-.if defined(${var})
- echo "export ${var}=\"${${var}}\"" >> ${_MK}
-.endif
-.endfor
- # Don't remove this, or the build will fall over!
- echo "export RELEASEDIR=${_R}" >> ${_MK}
- echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >>
${_MK}
- echo "export MANBUILDCAT=YES" >> ${_MK}
- # NB: these may fail if the host is running w/o devfs
- echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK}
- echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >>
${_MK}
- echo "if [ ! -c /dev/null ]; then" >> ${_MK}
- echo " echo /dev/null is not a device!" >> ${_MK}
- echo " exit 1" >> ${_MK}
- echo "fi" >> ${_MK}
- echo "if [ -x /etc/rc.d/ldconfig ]; then" >> ${_MK}
- echo " /etc/rc.d/ldconfig start" >> ${_MK}
- echo "else" >> ${_MK}
- echo " ldconfig /lib /usr/lib /usr/local/lib || true" >> ${_MK}
- echo "fi" >> ${_MK}
- echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK}
- echo " cd /usr/src" >> ${_MK}
- echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNO_CLEAN buildworld && \\" >>
${_MK}
- echo " touch /tmp/.world_done || exit 1" >> ${_MK}
- echo "fi" >> ${_MK}
- echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK}
- echo " echo \">>> make index started on \`LC_ALL=C TZ=GMT date\`\"" >>
${_MK}
- echo " for i in ${MAKEINDEXPORTS}" >> ${_MK}
- echo " do" >> ${_MK}
- echo " cd /usr/ports/\$${i}" >> ${_MK}
- echo " env -i HTTP_PROXY=$${HTTP_PROXY}
FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH}
\\" >> ${_MK}
- echo " make all install clean BATCH=yes
FORCE_PKG_REGISTER=yes" >> ${_MK}
- echo " done" >> ${_MK}
- echo " cd /usr/ports" >> ${_MK}
- echo " rm -f INDEX*" >> ${_MK}
- echo " make index -DINDEX_PRISTINE" >> ${_MK}
- echo " rm -f INDEX*.tmp" >> ${_MK}
- echo " touch /tmp/.skip_ports_index" >> ${_MK}
- echo " echo \">>> make index finished on \`LC_ALL=C TZ=GMT date\`\""
>> ${_MK}
- echo "fi" >> ${_MK}
- echo "cd /usr/src/release" >> ${_MK}
- echo "make obj" >> ${_MK}
- echo "make \$${_RELTARGET}" >> ${_MK}
- echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C
TZ=GMT date\`\"" >> ${_MK}
- chmod 755 ${_MK}
-.if defined(NOPORTS)
- touch ${CHROOTDIR}/tmp/.skip_ports_index
+.if !exists(${PORTSDIR})
+NOPORTS= true
.endif
- # Ensure md.ko is loaded if md(4) is not statically compiled into
- # the kernel
- -mdconfig 2>/dev/null
- env -i /usr/sbin/chroot `dirname ${_MK}` /`basename ${_MK}`
-clean:
- rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-8] ${EXTRAS}
-
-fetch-distfiles:
- @for i in ${MAKEINDEXPORTS}; do \
- cd ${CHROOTDIR}/usr/ports/$$i && \
- make PORTSDIR=${CHROOTDIR}/usr/ports BATCH=yes \
- checksum-recursive ; \
- done
- @for i in ${DOCPORTS}; do \
- cd ${CHROOTDIR}/usr/ports/$$i && \
- make PORTSDIR=${CHROOTDIR}/usr/ports BATCH=yes \
- WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes \
- checksum-recursive ; \
- done
-
-# Clean out ${_R} and make the directory structure.
-release.1:
- mkdir -p ${_R}
- -rm -rf ${_R}/* 2> /dev/null
- -chflags -R noschg ${_R}/.
- rm -rf ${_R}/*
- mkdir ${RD}
-.if defined(MAKE_FLOPPIES)
- mkdir ${RD}/floppies
-.endif
- mkdir ${RD}/trees
- for i in ${DISTRIBUTIONS}; do \
- mkdir ${RD}/trees/$$i && \
- mtree -deU -f ${MTREEFILES}/BSD.root.dist \
- -p ${RD}/trees/$$i > /dev/null && \
- mtree -deU -f ${MTREEFILES}/BSD.usr.dist \
- -p ${RD}/trees/$$i/usr > /dev/null && \
- mtree -deU -f ${MTREEFILES}/BSD.include.dist \
- -p ${RD}/trees/$$i/usr/include > /dev/null; \
- done
- mkdir ${RD}/kernels
- for i in ${KERNELS_BASE} ${KERNELS}; do \
- mkdir -p ${RD}/kernels/$${i}; \
- done
- touch ${.TARGET}
-
-# Install the system into the various distributions.
-release.2:
- cd ${.CURDIR}/.. && ${CROSSMAKE} distrib-dirs DESTDIR=${RD}/trees/base
- cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \
- DISTDIR=${RD}/trees
- sh ${.CURDIR}/scripts/mm-mtree.sh -F "${CROSSENV}" -D "${RD}/trees/base"
- touch ${.TARGET}
-
-# Make and install the generic kernel(s).
-release.3:
-.for kernel in ${KERNELS_BASE} ${KERNELS}
- cd ${.CURDIR}/..; \
- ${CROSSMAKE} ${KERNEL_FLAGS} \
- KERNCONF=${kernel} kernel \
- DESTDIR=${RD}/kernels KODIR=/${kernel}
-.endfor
- touch ${.TARGET}
-
-# Make and install the three crunched binaries which live on the floppies.
-# You are not supposed to like this :-)
-release.4:
- rm -rf ${RD}/crunch
- mkdir -p ${RD}/crunch
-.for j in ${CRUNCH_TARGETS}
-.if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf)
- rm -rf ${j}_crunch
- mkdir ${j}_crunch
- cd ${j}_crunch; ${WMAKEENV} MAKEFLAGS="-m ${.CURDIR}/../share/mk" \
- NO_WERROR= crunchgen -o \
- ${.CURDIR}/${TARGET}/${j}_crunch.conf
- cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
- cd ${.CURDIR}/..; ${BINMAKE} -f Makefile.inc1 _build-tools
- cd ${j}_crunch; CFLAGS="-Os -pipe" ${WMAKE} -f ${j}_crunch.mk \
- -DNO_CPU_CFLAGS all
- ${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch
- mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j}
-.endif
-.endfor
- touch ${.TARGET}
-
-#
-# --==## Fix up the distributions. ##==--
-#
-release.5:
- # Create any "synthetic dists" now.
- @for i in ${DISTRIBUTIONS}; do \
- if [ -f ${.CURDIR}/scripts/$${i}-make.sh ]; then \
- echo -n "Running $$i dist creation script... "; \
- env RD=${RD} sh ${.CURDIR}/scripts/$${i}-make.sh ||
echo "$$i distribution script returned bad status."; \
- echo "Done."; \
- fi \
- done \
-
- # Remove all the directories we don't need.
- -cd ${RD}/trees && \
- (find ${OTHER_DISTS} -path '*/var/empty' | xargs chflags
noschg; \
- find ${OTHER_DISTS} -depth -type d -empty -delete)
- touch ${.TARGET}
-
-#
-# --==## Package up the tarballs from assembled trees ##==--
-#
-release.6:
- rm -rf ${RD}/dists
- mkdir -p ${RD}/dists
- @for i in ${DISTRIBUTIONS} ; \
- do \
- if [ -d ${RD}/trees/$${i} ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
- SD=${RD}/trees/$${i} \
- TN=$$i TD=$$i ARG="." && \
- echo "$${i} distribution is finished."; \
- fi ; \
- done
- @for i in ${KERNELS_BASE} ${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
+EXTRA_PACKAGES=
.if !defined(NOPORTS)
- # XXX: Inline stripped version of doTARBALL
- @rm -rf ${RD}/dists/ports/ports*
- @mkdir -p ${RD}/dists/ports
- @echo rolling ports/ports tarball
- @tar --exclude CVS --exclude .svn --exclude 'ports/distfiles/*' \
- -czf ${RD}/dists/ports/ports.tgz -C /usr ports
- @cp ${.CURDIR}/scripts/ports-install.sh ${RD}/dists/ports/install.sh
- @(cd ${RD}/dists/ports; \
- rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \
- md5 * > .CHECKSUM.MD5; \
- sha256 * > .CHECKSUM.SHA256; \
- mv .CHECKSUM.MD5 CHECKSUM.MD5; \
- mv .CHECKSUM.SHA256 CHECKSUM.SHA256)
- @echo "ports distribution is finished."
+EXTRA_PACKAGES+= ports.txz
.endif
- touch ${.TARGET}
-
-
-#
-# --==## Make source dists ##==--
-#
-release.7:
.if !defined(NOSRC)
- @cd ${.CURDIR} && $(MAKE) doTARBALL SD=/usr/src \
- TD=src TN=sbase ARG="[A-Z]*"
- @for i in `cd /usr/src && echo [a-z]*` ; do \
- if [ -d /usr/src/$$i ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
- TN=`echo s$$i | tr -d '.' | \
- sed -e 's/usr/u/' \
- -e 's/kerberos5/krb5/'` \
- SD=/usr/src TD=src ARG="$$i" ; \
- fi ; \
- done
-.if defined(EXTRA_SRC)
- @set ${EXTRA_SRC} && \
- while [ $$# -ge 2 ] ; do \
- if [ -d /usr/src/$$1 ] ; then \
- cd ${.CURDIR} && $(MAKE) doTARBALL \
- SD=/usr/src TN="s$$2" TD=src ARG="$$1" ; \
- fi && shift && shift ; \
- done
-.endif
- (cd ${RD}/dists/src; \
- rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \
- md5 * > .CHECKSUM.MD5; \
- sha256 * > .CHECKSUM.SHA256; \
- mv .CHECKSUM.MD5 CHECKSUM.MD5; \
- mv .CHECKSUM.SHA256 CHECKSUM.SHA256)
- @echo "src distribution is finished."
+EXTRA_PACKAGES+= src.txz
.endif
- touch ${.TARGET}
-
-# Build the memory root filesystem.
-release.8:
- cp ${RD}/trees/base/etc/disktab /etc
- rm -rf ${RD}/mfsfd
- mkdir ${RD}/mfsfd
- cd ${RD}/mfsfd && \
- mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help \
- var/empty
- @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
- DIR=${RD}/mfsfd/stand ZIP=false
- ( cd ${RD}/mfsfd && \
- for dir in bin sbin ; do \
- ln -sf /stand $$dir; \
- done )
- cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand
- cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
- cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/
- ( for F in defaults/rc.conf netconfig protocols ; do \
- sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
- ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
- done )
- grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
- ${RD}/trees/base/etc/services | \
- sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
- > ${RD}/mfsfd/stand/etc/services
- grep 'operator' ${RD}/trees/base/etc/group \
- > ${RD}/mfsfd/stand/etc/group
- ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
- ln ${RD}/mfsfd/stand/etc/group ${RD}/mfsfd/etc/group
- ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
- cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
.if !defined(NODOC)
- @for i in ${DIST_DOCS_ARCH_INDEP}; do \
- cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \
- ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
- done
- @for i in ${DIST_DOCS_ARCH_DEP}; do \
- cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \
- ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
- done
-.endif
- -test -f ${.CURDIR}/install.cfg \
- && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
- @mkdir -p ${RD}/mfsfd/boot
-.if ${TARGET_ARCH} != "ia64" && ${TARGET_CPUARCH} != "powerpc"
- @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
+EXTRA_PACKAGES+= reldoc
.endif
-.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
- @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
-.endif
- @tar --exclude CVS --exclude .svn -cf - \
- -C ${.CURDIR}/../usr.sbin/sysinstall help | \
- tar xf - -C ${RD}/mfsfd/stand
- @mkdir -p ${RD}/mfsroot
- sh -e ${DOFS_SH} ${RD}/mfsroot/mfsroot ${RD} ${MNT} \
- ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
- @${ZIPPER} -fv ${RD}/mfsroot/mfsroot
- touch ${.TARGET}
-KERNFLOPPYSET= ${RD}/floppyset/kern/kernel.gz
-.if defined(SMALLFLOPPYSIZE)
-SMALLKERNFLOPPYSET= ${RD}/floppyset/kern-small/kernel.gz
-.endif
-.if defined(SPLIT_MFSROOT)
-MFSROOTFLOPPYSET= ${RD}/floppyset/mfsroot/mfsroot.gz
-.if defined(SMALLFLOPPYSIZE)
-SMALLMFSROOTFLOPPYSET= ${RD}/floppyset/mfsroot-small/mfsroot.gz
+RELEASE_TARGETS= ftp
+.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
+RELEASE_TARGETS+= cdrom
.endif
+.if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
+RELEASE_TARGETS+= memstick
.endif
-# Build boot and install floppies.
-floppies.1:
- @${ZIPPER} -c ${RD}/kernels/${KERN_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
-.if defined(SMALLFLOPPYSIZE)
- @echo "Making the small kernel boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=kern-small \
- FLOPPYDESC="Kernel" SPLITFILE=${RD}/kernels/kernel.gz \
- FDSIZE="SMALL"
-.endif
-.if defined(SPLIT_MFSROOT)
- @echo "Making the mfsroot boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=mfsroot \
- FLOPPYDESC="Memory Filesystem" SPLITFILE=${RD}/mfsroot/mfsroot.gz
-.if defined(SMALLFLOPPYSIZE)
- @echo "Making the small mfsroot boot floppies..."
- @cd ${.CURDIR} && ${MAKE} makeFloppySet FLOPPYBASE=mfsroot-small \
- FLOPPYDESC="Memory Filesystem" SPLITFILE=${RD}/mfsroot/mfsroot.gz \
- FDSIZE="SMALL"
-.endif
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \
- KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \
- MFSROOTFILE="${MFSROOTFLOPPYSET}.split ${MFSROOTFLOPPYSET}.boot"
-.if defined(SMALLFLOPPYSIZE)
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \
- KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \
- MFSROOTFILE="${SMALLMFSROOTFLOPPYSET}.split
${SMALLMFSROOTFLOPPYSET}.boot" \
- FDSIZE="SMALL"
-.endif
-.else # !SPLIT_MFSROOT
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot" \
- KERNFILE="${KERNFLOPPYSET}.split ${KERNFLOPPYSET}.boot" \
- MFSROOTFILE=${RD}/mfsroot/mfsroot.gz
-.if defined(SMALLFLOPPYSIZE)
- @cd ${.CURDIR} && ${MAKE} buildBootFloppy FSIMAGE="boot-small" \
- KERNFILE="${SMALLKERNFLOPPYSET}.split ${SMALLKERNFLOPPYSET}.boot" \
- MFSROOTFILE=${RD}/mfsroot/mfsroot.gz \
- FDSIZE="SMALL"
-.endif
-.endif # SPLIT_MFSROOT
- touch ${.TARGET}
-
-# Build fixit floppy.
-floppies.2:
- @echo "Making fixit floppy."
- @rm -rf ${RD}/fixitfd
- @mkdir ${RD}/fixitfd
- @cd ${RD}/fixitfd && \
- mkdir -p dev stand bin sbin etc mnt mnt1 mnt2 mnt3 mnt4 tmp \
- usr/share/misc
- @cp ${RD}/trees/base/etc/spwd.db ${RD}/trees/base/etc/group \
- ${RD}/fixitfd/etc
- @sed -e 's/#.*//' ${RD}/trees/base/etc/protocols \
- > ${RD}/fixitfd/etc/protocols
- @sed -e 's/#.*//' ${RD}/trees/base/usr/share/misc/scsi_modes \
- > ${RD}/fixitfd/usr/share/misc/scsi_modes
- @cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
- @cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
- @cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar
- @chmod 555 ${RD}/fixitfd/stand/tar
-.if defined(SMALLFLOPPYSIZE)
- @cd ${.CURDIR} && ${MAKE} installCRUNCH CRUNCH=fixit-small \
- DIR=${RD}/fixitfd/stand ZIP=false
- @sh -e ${DOFS_SH} ${RD}/floppies/fixit-small.flp ${RD} ${MNT} \
- ${SMALLFLOPPYSIZE} ${RD}/fixitfd ${FLOPPYINODE} ${SMALLFLOPPYLABEL}
- @rm -rf ${RD}/fixitfd/stand
- @mkdir ${RD}/fixitfd/stand
-.endif
- @cd ${.CURDIR} && ${MAKE} installCRUNCH CRUNCH=fixit \
- DIR=${RD}/fixitfd/stand ZIP=false
- @sh -e ${DOFS_SH} ${RD}/floppies/fixit.flp ${RD} ${MNT} \
- ${FLOPPYSIZE} ${RD}/fixitfd ${FLOPPYINODE} ${FLOPPYLABEL}
- touch ${.TARGET}
-
-# Do our last minute floppies directory setup
-floppies.3:
- @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
- @(cd ${RD}/floppies; sha256 *.flp > CHECKSUM.SHA256)
- touch ${.TARGET}
-
-#
-# --==## Setup a suitable ftp-area ##==--
-#
-ftp.1:
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
