summaryrefslogtreecommitdiff
path: root/sysutils/sysbuild
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2002-11-30 15:50:16 +0000
committerjmmv <jmmv@pkgsrc.org>2002-11-30 15:50:16 +0000
commitd6833f77dce28e24184bed3d889c3b997da754b3 (patch)
treea2b58f057eb263a074f108c16d1ce4332338b834 /sysutils/sysbuild
parentc7a2c08d66818b147a5fe131e431328058c85505 (diff)
downloadpkgsrc-d6833f77dce28e24184bed3d889c3b997da754b3.tar.gz
During the build-sets target, sysbuild directly calls `make sets' inside
distrib/sets. This call requires TOOLDIR to be set accordingly so that make can find sysbuild compiled tools. Reported by Sergio Jiménez (sjr at hispabsd dot org). Also add a note in the manpage telling the user to use ?= in his mk.conf, so that sysbuild can override the values there (specially for things like TOOLDIR). Bump version to 1.1.
Diffstat (limited to 'sysutils/sysbuild')
-rw-r--r--sysutils/sysbuild/Makefile4
-rw-r--r--sysutils/sysbuild/files/sysbuild.812
-rw-r--r--sysutils/sysbuild/files/sysbuild.sh4
3 files changed, 15 insertions, 5 deletions
diff --git a/sysutils/sysbuild/Makefile b/sysutils/sysbuild/Makefile
index f82739971e5..5cc637ce681 100644
--- a/sysutils/sysbuild/Makefile
+++ b/sysutils/sysbuild/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/28 19:57:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/30 15:50:16 jmmv Exp $
#
-DISTNAME= sysbuild-1.0
+DISTNAME= sysbuild-1.1
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/sysutils/sysbuild/files/sysbuild.8 b/sysutils/sysbuild/files/sysbuild.8
index 39e53ba107a..4d3e0478b65 100644
--- a/sysutils/sysbuild/files/sysbuild.8
+++ b/sysutils/sysbuild/files/sysbuild.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysbuild.8,v 1.1.1.1 2002/11/28 19:57:29 jmmv Exp $
+.\" $NetBSD: sysbuild.8,v 1.2 2002/11/30 15:50:17 jmmv Exp $
.\"
.\" sysbuild - Automatic NetBSD system builds
.\" Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
@@ -420,6 +420,16 @@ This program will only work in
and above.
Some targets may work in previous versions, but do not expect it to
work fine.
+.Pp
+If you are changing some of the default directories in your
+.Pa /etc/mk.conf ,
+be sure to use the
+.Ql ?=
+operator instead of
+.Ql =
+so
+.Nm
+can override their value.
.Sh AUTHORS
.An Julio Merino Aq jmmv@netbsd.org
.Sh TO DO
diff --git a/sysutils/sysbuild/files/sysbuild.sh b/sysutils/sysbuild/files/sysbuild.sh
index 9d029607c79..082e8cbd140 100644
--- a/sysutils/sysbuild/files/sysbuild.sh
+++ b/sysutils/sysbuild/files/sysbuild.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sysbuild.sh,v 1.1.1.1 2002/11/28 19:57:29 jmmv Exp $
+# $NetBSD: sysbuild.sh,v 1.2 2002/11/30 15:50:17 jmmv Exp $
#
# sysbuild - Automatic NetBSD system builds
# Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
@@ -256,7 +256,7 @@ sysbuild_build_sets() {
echo -n "Making sets:"
mkdir -p $RELEASEDIR/binary/sets
cd $SRCDIR/distrib/sets
- make sets DESTDIR=$BUILDDIR/root RELEASEDIR=$RELEASEDIR UNPRIVED=yes >> $_log 2>&1
+ make sets TOOLDIR=$BUILDDIR/tools DESTDIR=$BUILDDIR/root RELEASEDIR=$RELEASEDIR UNPRIVED=yes >> $_log 2>&1
if [ $? -ne 0 ]; then
echo " failed."
else