Module Name: src
Committed By: cegger
Date: Tue Mar 30 13:17:47 UTC 2010
Modified Files:
src: build.sh
Log Message:
move change from rev 1.232 to the initialization part.
This fixes the problem 'nbconfig: cannot create /GENERIC'
when KERNOBJDIR has a relative path and is defined as env variable.
Problem reported and fix proposed on tech-toolch...@.
'commit it then' christos@
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.232 src/build.sh:1.233
--- src/build.sh:1.232 Fri Mar 26 18:02:14 2010
+++ src/build.sh Tue Mar 30 13:17:47 2010
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.232 2010/03/26 18:02:14 christos Exp $
+# $NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -259,6 +259,15 @@
#
setmakeenv NETBSDSRCDIR "${TOP}"
+ # Make sure KERNOBJDIR is an absolute path if defined
+ #
+ case "${KERNOBJDIR}" in
+ ''|/*) ;;
+ *) KERNOBJDIR="${TOP}/${KERNOBJDIR}"
+ setmakeenv KERNOBJDIR "${KERNOBJDIR}"
+ ;;
+ esac
+
# Find the version of NetBSD
#
DISTRIBVER="$(${HOST_SH} ${TOP}/sys/conf/osrelease.sh)"
@@ -1352,7 +1361,7 @@
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.232 2010/03/26 18:02:14 christos Exp $
+# Generated from: \$NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
# with these arguments: ${_args}
#
@@ -1421,13 +1430,6 @@
fi
KERNCONFDIR="$(getmakevar KERNCONFDIR)"
KERNOBJDIR="$(getmakevar KERNOBJDIR)"
- case "${KERNOBJDIR}" in
- ''|/*) ;;
- *) KERNOBJDIR="${TOP}/${KERNOBJDIR}"
- setmakeenv KERNOBJDIR "${KERNOBJDIR}"
- ;;
- esac
-
case "${kernelconf}" in
*/*)
kernelconfpath="${kernelconf}"
