Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an iso-image-source option which does the same thing as iso-image but

Browse Source 
includes source sets as well.  The infrastructure for this was already
there, although it needed a bug fix.  Will look at adding arbitrary
directories next.
This commit is contained in:
jnemeth 2007-08-30 05:30:02 +00:00
parent 7ac92eed2a
commit a186842ea2
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.247 2007/03/06 21:56:47 bouyer Exp $
# $NetBSD: Makefile,v 1.248 2007/08/30 05:30:02 jnemeth Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@ -62,9 +62,13 @@
# syspkgs:
# Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
# iso-image:
# Create CD-ROM image in RELEASEDIR/MACHINE/installation.
# Create CD-ROM image in RELEASEDIR/iso.
# RELEASEDIR must already have been populated by `make release'
# or equivalent.
# iso-image-source:
# Create CD-ROM image with source in RELEASEDIR/iso.
# RELEASEDIR must already have been populated by
# `make release sourcesets' or equivalent.
#
# Targets invoked by `make build,' in order:
# cleandir: cleans the tree.
@ -319,6 +323,12 @@ iso-image: .PHONY
@echo "make ${.TARGET} started at: ${START_TIME}"
@printf "make ${.TARGET} finished at: " && date
iso-image-source: .PHONY
${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
${MAKEDIRTARGET} etc iso-image
@echo "make ${.TARGET} started at: ${START_TIME}"
@printf "make ${.TARGET} finished at: " && date
#
# Special components of the "make build" process.
#

14
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.171 2007/06/26 12:59:38 apb Exp $
# $NetBSD: build.sh,v 1.172 2007/08/30 05:30:02 jnemeth Exp $
#
# Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
# All rights reserved.
@ -230,6 +230,7 @@ initdefaults()
do_sourcesets=false
do_syspkgs=false
do_iso_image=false
do_iso_image_source=false
do_params=false
# Create scratch directory
@ -522,7 +523,8 @@ Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-D dest] [-j njob]
DESTDIR should be populated beforehand.
sourcesets Create source sets in RELEASEDIR/source/sets.
syspkgs Create syspkgs in RELEASEDIR/MACHINE/binary/syspkgs.
iso-image Create CD-ROM image in RELEASEDIR/MACHINE/installation.
iso-image Create CD-ROM image in RELEASEDIR/iso.
iso-image-source Create CD-ROM image with source in RELEASEDIR/iso.
params Display various make(1) parameters.
Options:
@ -769,6 +771,10 @@ parseoptions()
op=iso_image # used as part of a variable name
;;
iso-image-source)
op=iso_image_source # used as part of a variable name
;;
kernel=*|releasekernel=*)
arg=${op#*=}
op=${op%%=*}
@ -1083,7 +1089,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.171 2007/06/26 12:59:38 apb Exp $
# Generated from: \$NetBSD: build.sh,v 1.172 2007/08/30 05:30:02 jnemeth Exp $
# with these arguments: ${_args}
#
EOF
@ -1266,7 +1272,7 @@ main()
statusmsg "Successful make ${op}"
;;
obj|build|distribution|iso-image|release|sourcesets|syspkgs|params)
obj|build|distribution|iso-image|iso-image-source|release|sourcesets|syspkgs|params)
${runcmd} "${makewrapper}" ${parallel} ${op} ||
bomb "Failed to make ${op}"
statusmsg "Successful make ${op}"