diff options
author | joerg <joerg> | 2007-04-12 20:31:04 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-04-12 20:31:04 +0000 |
commit | a42eaec874f9e3b7261be64ce1765e1402424656 (patch) | |
tree | dedded27aba63e7cb925e76a533358df6d13a6e3 /bootstrap | |
parent | a5e6b5547d91997f02e20da39d2f0b827be839a0 (diff) | |
download | pkgsrc-a42eaec874f9e3b7261be64ce1765e1402424656.tar.gz |
Change bootstrap to register bmake as package. Change bmake to
use inplace libnbcompat like the direct build from bootstrap
does. Fix a long-standing bug in mkbinarykit. The default work
directory was "work" (relative) and therefore MAKECONF=work/...
was passed down, effectively making it a nop. That resulted in
digest being incorrectly installed during the bootstrap.
Tested on DragonFly by myself and on OSF by tnn@, discussed with jlam@
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap/bootstrap | 3 | ||||
-rwxr-xr-x | bootstrap/mkbinarykit | 19 |
2 files changed, 9 insertions, 13 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 262fa96d489..120b810ab17 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.93 2007/04/12 14:36:40 joerg Exp $ +# $NetBSD: bootstrap,v 1.94 2007/04/12 20:31:04 joerg Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -894,6 +894,7 @@ register_package() { echo_msg "Registering installed packages" register_package "pkgtools/bootstrap-mk-files" +register_package "devel/bmake" case "$need_awk" in yes) register_package "lang/nawk";; esac diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit index 4613480da43..a8660e330e6 100755 --- a/bootstrap/mkbinarykit +++ b/bootstrap/mkbinarykit @@ -1,11 +1,10 @@ #!/bin/sh -# $NetBSD: mkbinarykit,v 1.15 2006/04/11 14:35:48 joerg Exp $ +# $NetBSD: mkbinarykit,v 1.16 2007/04/12 20:31:04 joerg Exp $ # # Make a binary bootstrap kit and place it in targetdir (or current # working directory if not specified). The mk.conf.example file is -# copied to /etc/mk.conf (or /etc/mk.conf.example on systems which -# may already have a /etc/mk.conf file) or to the location specified +# copied to ${PREFIX}/etc/mk.conf or to the location specified # by using --mkconf. Run this program from the pkgsrc/bootstrap # directory. @@ -20,23 +19,22 @@ ospro=`uname -p` date=`date +%Y%m%d` prefix=/usr/pkg -sysconfdir=/etc +sysconfdir=$prefix/etc pkgdbdir=/var/db/pkg -mkfile=$sysconfdir/mk.conf +mkfile= ignorecasecheck=no ignoreusercheck=no force=no build=yes fetch_cmd="" targetdir=`pwd` -wrkdir=work # default: relative to pkgsrc/bootstrap +wrkdir=`pwd`/work # default: relative to pkgsrc/bootstrap sedprog="sed" case "$opsys" in AIX) syscondir=$prefix/etc - mkfile=$sysconfdir/mk.conf pkgdbdir=$prefix/pkgdb ;; DragonFly) @@ -54,18 +52,13 @@ FreeBSD) pkgdbdir=$prefix/pkgdb ;; Interix) - mkfile=$sysconfdir/mk.conf.example # Don't use the interopsystems.com package dir pkgdbdir=$prefix/pkgdb ospro=i386 ;; NetBSD) - # Don't overwrite the system's mk.conf - mkfile=$sysconfdir/mk.conf.example ;; OpenBSD) - # Don't overwrite the system's mk.conf - mkfile=$sysconfdir/mk.conf.example # Don't use the ports /var/db/pkg pkgdbdir=$prefix/pkgdb # Use "arch -s" instead of uname -p @@ -93,6 +86,8 @@ while [ $# -gt 0 ]; do shift done +[ -z "${mkfile}" ] && mkfile="$prefix/etc/mk.conf" + if [ "$build" = "yes" ] && [ "$force" != "yes" ]; then if [ -d "$prefix" ] || [ -d "$pkgdbdir" ]; then echo "Some pkgsrc infrastructure exists on this system already." |