Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src ``build.sh -m xen-i386 release'' now builds a release for Ne...
details: https://anonhg.NetBSD.org/src/rev/05b3317005c8
branches: trunk
changeset: 566557:05b3317005c8
user: cl <cl%NetBSD.org@localhost>
date: Wed May 12 16:56:41 2004 +0000
description:
``build.sh -m xen-i386 release'' now builds a release for NetBSD/xen
for i386. The resulting release consists of:
- NetBSD/xen for i386 kernel, loader and docuemntation
- NetBSD/i386 userland sets
diffstat:
build.sh | 17 ++++++++++++++-
distrib/Makefile | 8 ++++--
distrib/notes/Makefile | 9 +++++--
distrib/notes/xen/Makefile | 8 +++++++
distrib/notes/xen/upgrade | 2 +
distrib/sets/Makefile | 4 +-
distrib/xen/Makefile | 5 ++++
etc/Makefile | 36 +++++++++++++++++-----------------
etc/etc.xen/Makefile.inc | 18 +++++++++++++++++
share/mk/bsd.README | 12 ++++++++++-
share/mk/bsd.kmod.mk | 15 +++++++++++++-
share/mk/bsd.own.mk | 16 ++++++++++++++-
sys/arch/Makefile | 5 +++-
sys/arch/xen/Makefile | 37 +++++++++++++++++++++++++++++++++++
sys/arch/xen/conf/Makefile.arch.inc | 13 ++++++++++++
sys/arch/xen/conf/Makefile.xen | 31 ++++++++++++++---------------
sys/arch/xen/include/Makefile | 3 ++
sys/arch/xen/stand/Makefile | 5 ++++
sys/arch/xen/stand/xen12load/Makefile | 13 +++++++++++-
19 files changed, 208 insertions(+), 49 deletions(-)
diffs (truncated from 577 to 300 lines):
diff -r 262cbe98d944 -r 05b3317005c8 build.sh
--- a/build.sh Wed May 12 16:48:44 2004 +0000
+++ b/build.sh Wed May 12 16:56:41 2004 +0000
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.127 2004/02/06 23:19:30 lukem Exp $
+# $NetBSD: build.sh,v 1.128 2004/05/12 16:56:41 cl Exp $
#
# Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -212,6 +212,19 @@
MACHINE_ARCH=x86_64
;;
+ xen-*)
+ setmakeenv XEN_BUILD "${MACHINE##*-}"
+ setmakeenv KERNARCHDIR "arch/xen"
+ setmakeenv RELEASEMACHINE "xen"
+ setmakeenv RELEASEMACHINEDIR "${MACHINE}"
+ makewrappermachine=${MACHINE}
+ MACHINE=${MACHINE##*-}
+ getarch
+ ;;
+
+ xen) # no default MACHINE_ARCH
+ ;;
+
alpha|i386|sparc|sparc64|vax)
MACHINE_ARCH=${MACHINE}
;;
@@ -842,7 +855,7 @@
eval cat <<EOF ${makewrapout}
#! /bin/sh
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.127 2004/02/06 23:19:30 lukem Exp $
+# Generated from: \$NetBSD: build.sh,v 1.128 2004/05/12 16:56:41 cl Exp $
#
EOF
diff -r 262cbe98d944 -r 05b3317005c8 distrib/Makefile
--- a/distrib/Makefile Wed May 12 16:48:44 2004 +0000
+++ b/distrib/Makefile Wed May 12 16:56:41 2004 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/04/25 06:19:49 christos Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/12 16:56:41 cl Exp $
+
+.include <bsd.own.mk>
SUBDIR= notes .WAIT
@@ -6,8 +8,8 @@
SUBDIR+= miniroot .WAIT
.endif
-.if exists(${MACHINE}/Makefile)
-SUBDIR+= ${MACHINE}
+.if exists(${RELEASEMACHINE}/Makefile)
+SUBDIR+= ${RELEASEMACHINE}
.endif
.if make(obj)
diff -r 262cbe98d944 -r 05b3317005c8 distrib/notes/Makefile
--- a/distrib/notes/Makefile Wed May 12 16:48:44 2004 +0000
+++ b/distrib/notes/Makefile Wed May 12 16:56:41 2004 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.32 2003/10/10 23:51:46 mbw Exp $
+# $NetBSD: Makefile,v 1.33 2004/05/12 16:56:41 cl Exp $
#
+.include <bsd.own.mk>
+
TARGETS+= release
.ifndef ALLNOTES
-.if exists(${MACHINE}/Makefile)
-SUBDIR= ${MACHINE}
+.if exists(${RELEASEMACHINE}/Makefile)
+SUBDIR= ${RELEASEMACHINE}
.endif
.else
SUBDIR+= acorn26
@@ -41,6 +43,7 @@
SUBDIR+= sun3
SUBDIR+= vax
SUBDIR+= x68k
+SUBDIR+= xen
.endif
.include <bsd.subdir.mk>
diff -r 262cbe98d944 -r 05b3317005c8 distrib/notes/xen/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/notes/xen/Makefile Wed May 12 16:56:41 2004 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2004/05/12 16:56:41 cl Exp $
+
+MACHINE:= xen-${MACHINE}
+M= ${MACHINE}
+
+MERGED_SRCS+= ${COMMON}/xfer
+
+.include <bsd.man.mk>
diff -r 262cbe98d944 -r 05b3317005c8 distrib/notes/xen/upgrade
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/notes/xen/upgrade Wed May 12 16:56:41 2004 +0000
@@ -0,0 +1,2 @@
+This is the 1st release of
+.Nx*M .
diff -r 262cbe98d944 -r 05b3317005c8 distrib/sets/Makefile
--- a/distrib/sets/Makefile Wed May 12 16:48:44 2004 +0000
+++ b/distrib/sets/Makefile Wed May 12 16:56:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2004/04/20 06:36:34 lukem Exp $
+# $NetBSD: Makefile,v 1.46 2004/05/12 16:56:41 cl Exp $
# The `all' target must appear before bsd.own.mk is pulled in.
all:
@@ -59,7 +59,7 @@
# SET BUILDING TARGETS
#
-TARDIR= ${RELEASEDIR}/${MACHINE}/binary/sets
+TARDIR= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
SOURCETARDIR= ${RELEASEDIR}/source/sets
.if ${MKUNPRIVED} == "no"
diff -r 262cbe98d944 -r 05b3317005c8 distrib/xen/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/xen/Makefile Wed May 12 16:56:41 2004 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2004/05/12 16:56:41 cl Exp $
+
+TARGETS+= release
+
+.include <bsd.subdir.mk>
diff -r 262cbe98d944 -r 05b3317005c8 etc/Makefile
--- a/etc/Makefile Wed May 12 16:48:44 2004 +0000
+++ b/etc/Makefile Wed May 12 16:56:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.285 2004/04/13 12:43:12 lukem Exp $
+# $NetBSD: Makefile,v 1.286 2004/05/12 16:56:41 cl Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -27,7 +27,7 @@
# distrib-dirs: creates an empty NetBSD directory tree in DESTDIR.
# Called by distribution.
# snapshot: calls distribution, above, and then tars up the files
-# into a release(7) format in RELEASEDIR/${MACHINE}.
+# into a release(7) format in RELEASEDIR/${RELEASEMACHINEDIR}.
# Any port-dependent stuff for this target is found in
# etc.${MACHINE}/Makefile.inc.
# release: a synonym for `snapshot'
@@ -61,7 +61,7 @@
-r -T -v \
-V ${ISO_VOLID} \
-P "The NetBSD Project" \
- -m "${RELEASEDIR}/${MACHINE}/installation/cdrom"
+ -m "${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom"
# MD Makefile.inc may append MD targets to BIN[123]. Make sure all
# are empty, to preserve the old semantics of setting them below with "=".
@@ -70,14 +70,14 @@
BIN2=
BIN3=
-# Directories to build in ${RELEASEDIR}/${MACHINE}.
+# Directories to build in ${RELEASEDIR}/${RELEASEMACHINEDIR}.
# MD Makefile.inc files can add to this.
# NOTE: Parent directories must be listed before subdirectories.
#
INSTALLATION_DIRS= binary binary/sets binary/kernel installation
-.if exists(etc.${MACHINE}/Makefile.inc)
-.include "etc.${MACHINE}/Makefile.inc"
+.if exists(etc.${RELEASEMACHINE}/Makefile.inc)
+.include "etc.${RELEASEMACHINE}/Makefile.inc"
.endif
# -rw-r--r--
@@ -388,7 +388,7 @@
snap_pre .WAIT snap_kern .WAIT \
snap_post .WAIT snap_md_post
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/binary/kernel '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel '*.gz'
# iso-image --
@@ -397,19 +397,19 @@
#
# Note: At least mkisofs 2.0 should be used.
#
-CDROM.image=${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-${MACHINE}.iso
+CDROM.image=${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-${MACHINE}.iso
CDROM.dir= cdrom.dir
CDROM.pathlist= cdrom.pathlist
iso-image: .PHONY check_DESTDIR check_RELEASEDIR .WAIT iso-image-md-post
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/cdrom '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
@echo "iso-image created as: ${CDROM.image}"
iso-image-setup: .PHONY check_RELEASEDIR
rm -f ${CDROM.pathlist}
- echo "${MACHINE}=${RELEASEDIR}/${MACHINE}" >> ${CDROM.pathlist}
+ echo "${MACHINE}=${RELEASEDIR}/${RELEASEMACHINEDIR}" >> ${CDROM.pathlist}
mkdir -p ${CDROM.dir}
- mkdir -p ${RELEASEDIR}/${MACHINE}/installation/cdrom
+ mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
# iso-image-mi --
# Create the image after the MD operations have completed.
@@ -445,11 +445,11 @@
${INSTALL} -d -m 755 ${RELEASEDIR}
.if ${MKUPDATE} == "no"
# Could be a mount point, ignore the errors
- -/bin/rm -rf ${RELEASEDIR}/${MACHINE}
+ -/bin/rm -rf ${RELEASEDIR}/${RELEASEMACHINEDIR}
.endif
- ${INSTALL} -d -m 755 ${RELEASEDIR}/${MACHINE}
+ ${INSTALL} -d -m 755 ${RELEASEDIR}/${RELEASEMACHINEDIR}
.for dir in ${INSTALLATION_DIRS}
- ${INSTALL} -d -m 755 ${RELEASEDIR}/${MACHINE}/${dir}
+ ${INSTALL} -d -m 755 ${RELEASEDIR}/${RELEASEMACHINEDIR}/${dir}
.endfor
# snap_post --
@@ -529,7 +529,7 @@
# build_kernelsets --
# Create kernel sets from ${KERNEL_SETS} into
-# ${RELEASEDIR}/${MACHINE}/binary/sets
+# ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
#
.for configfile in ${KERNEL_SETS} # {
_KERNELSETS_TO_BUILD+=kernset-${configfile}
@@ -537,7 +537,7 @@
@ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile}`; \
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
- kern_tgz=${RELEASEDIR}/${MACHINE}/binary/sets/kern-${configfile}.tgz; \
+ kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
pax_cmd="GZIP=-9 ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
cd $${kerndir} && { \
kernels=; newest=; \
@@ -565,7 +565,7 @@
# build_releasekernels --
# Build kernel.gz from ${KERNEL_SETS} ${EXTRA_KERNELS} into
-# ${RELEASEDIR}/${MACHINE}/binary/kernel
+# ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel
#
.for configfile in ${KERNEL_SETS} ${EXTRA_KERNELS} # {
_RELEASEKERNELS_TO_BUILD+=releasekern-${configfile}
@@ -578,7 +578,7 @@
for s in "" $${kernsuffixes}; do \
ks="$${kernel}$${s}"; \
[ ! -f $${ks} ] && continue; \
- knl_gz="${RELEASEDIR}/${MACHINE}/binary/kernel/$${ks}-${configfile:C/.*\///}.gz"; \
+ knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${ks}-${configfile:C/.*\///}.gz"; \
[ $${knl_gz} -nt $${ks} ] && continue; \
echo "gzip -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
gzip -c -9 < $${ks} > $${knl_gz}; \
diff -r 262cbe98d944 -r 05b3317005c8 etc/etc.xen/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/etc.xen/Makefile.inc Wed May 12 16:56:41 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.inc,v 1.1 2004/05/12 16:56:43 cl Exp $
+#
+# etc.xen/Makefile.inc -- xen-specific etc Makefile targets
+#
+
+KERNEL_SETS=
+
+EXTRA_KERNELS= GENERIC XEN
+
+BUILD_KERNELS=
+
+INSTALLATION_DIRS+= installation/xen12load
+
+# xen specific distrib stuff
+snap_md_post:
+ cd ${KERNSRCDIR}/arch/xen/stand/xen12load && ${MAKE} release
+ ${MAKESUMS} -t \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/xen12load '*.*'
diff -r 262cbe98d944 -r 05b3317005c8 share/mk/bsd.README
--- a/share/mk/bsd.README Wed May 12 16:48:44 2004 +0000
+++ b/share/mk/bsd.README Wed May 12 16:56:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.151 2004/04/18 13:07:00 lukem Exp $
+# $NetBSD: bsd.README,v 1.152 2004/05/12 16:56:43 cl Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD
@@ -433,6 +433,16 @@
Runs "cd $${dir} && ${MAKE} [params] $${target}",
displaying a "pretty" message whilst doing so.
+RELEASEMACHINEDIR
+ Subdirectory used below RELEASEDIR when building
Home |
Main Index |
Thread Index |
Old Index