diff options
Diffstat (limited to 'pkgtools/pkg_comp/files/pkg_comp.sh')
| -rw-r--r-- | pkgtools/pkg_comp/files/pkg_comp.sh | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh index 1d31125f507..19b6484a0d4 100644 --- a/pkgtools/pkg_comp/files/pkg_comp.sh +++ b/pkgtools/pkg_comp/files/pkg_comp.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pkg_comp.sh,v 1.11 2003/09/07 22:31:18 jmmv Exp $ +# $NetBSD: pkg_comp.sh,v 1.12 2003/12/13 18:29:47 seb Exp $ # # pkg_comp - Build packages inside a clean chroot environment # Copyright (c) 2002, 2003, Julio M. Merino Vidal <jmmv@netbsd.org> @@ -117,7 +117,7 @@ err() usage() { - echo "usage: $ProgName [-c conf_file] target [pkg_names]" + echo "usage: $ProgName [-(c|C) conf_file] target [pkg_names]" exit 1 } @@ -402,9 +402,10 @@ pkg_makeroot() if [ "$NETBSD_RELEASE" != "no" ]; then BUILD_TARGET=install pkg_build pkgtools/libkver - echo "LD_PRELOAD=/usr/lib/libkver.so; export LD_PRELOAD" >> $DESTDIR/etc/shrc - echo "setenv LD_PRELOAD /usr/lib/libkver.so" >> $DESTDIR/etc/csh.login - echo "setenv LD_PRELOAD /usr/lib/libkver.so" >> $DESTDIR/etc/csh.cshrc + echo "LD_PRELOAD=${LOCALBASE}/lib/libkver.so; export LD_PRELOAD" >> $DESTDIR/etc/shrc + echo "setenv LD_PRELOAD ${LOCALBASE}/lib/libkver.so" >> $DESTDIR/etc/csh.login + echo "setenv LD_PRELOAD ${LOCALBASE}/lib/libkver.so" >> $DESTDIR/etc/csh.cshrc + ln -s "$NETBSD_RELEASE" $DESTDIR/libkver_osrelease fi if [ "$USE_GCC3" = "yes" ]; then @@ -436,6 +437,7 @@ makeroot_mkconf() # /etc/mk.conf # File automatically generated by pkg_comp on `date` # +.ifdef BSD_PKG_MK EOF @@ -454,10 +456,6 @@ EOF fi fi - if [ "$NETBSD_RELEASE" != "no" ]; then - echo "KVER_OSRELEASE = $NETBSD_RELEASE" >> $file - fi - if [ "$USE_AUDIT_PACKAGES" != "yes" ]; then echo "ALLOW_VULNERABLE_PACKAGES ?= YES" >> $file fi @@ -477,6 +475,8 @@ EOF CFLAGS += $CFLAGS CPPFLAGS += $CPPFLAGS CXXFLAGS += $CXXFLAGS + +.endif # BSD_PKG_MK EOF fi } @@ -654,18 +654,28 @@ pkg_removeroot() confdir="$HOME/pkg_comp" # Parse options -args=`getopt c: $*` +args=`getopt c:C: $*` if [ $? != 0 ]; then usage fi set -- $args -conffile="$confdir/default.conf" +conffile= while [ $# -gt 0 ]; do case "$1" in -c) + if [ -n "$conffile" ]; then + usage + fi conffile="$confdir/$2.conf" shift ;; + -C) + if [ -n "$conffile" ]; then + usage + fi + conffile="$2" + shift + ;; --) shift; break ;; @@ -677,6 +687,10 @@ if [ $# -lt 1 ]; then usage fi +if [ -z "$conffile" ]; then + conffile="$confdir/default.conf" +fi + target="$1" shift args="$*" |