diff options
| -rwxr-xr-x | bootstrap/bootstrap | 13 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 12 | ||||
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 3 |
3 files changed, 23 insertions, 5 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 971177eb275..5f761ce2ae5 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.299 2021/04/28 11:14:51 maya Exp $ +# $NetBSD: bootstrap,v 1.300 2021/05/30 23:41:05 khorben Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -74,6 +74,7 @@ usage="Usage: $0 "' [ --prefix <prefix> ] [ --preserve-path ] [ --quiet ] + [ --sysconfbase <sysconfbase> ] [ --sysconfdir <sysconfdir> ] [ --unprivileged | --ignore-user-check ] [ --varbase <varbase> ] @@ -413,6 +414,7 @@ prefix= pkgdbdir= pkginfodir= pkgmandir= +sysconfbase= sysconfdir= varbase= @@ -440,6 +442,8 @@ while [ $# -gt 0 ]; do --pkginfodir) pkginfodir="$2"; shift ;; --pkgmandir=*) pkgmandir=`get_optarg "$1"` ;; --pkgmandir) pkgmandir="$2"; shift ;; + --sysconfbase=*)sysconfbase=`get_optarg "$1"` ;; + --sysconfbase) sysconfbase="$2"; shift ;; --sysconfdir=*) sysconfdir=`get_optarg "$1"` ;; --sysconfdir) sysconfdir="$2"; shift ;; --varbase=*) varbase=`get_optarg "$1"` ;; @@ -485,6 +489,7 @@ while [ $# -gt 0 ]; do done checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir" +checkarg_sane_absolute_path "$sysconfbase" "--sysconfbase" checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir" checkarg_sane_absolute_path "$varbase" "--varbase" checkarg_sane_relative_path "$pkginfodir" "--pkginfodir" @@ -500,6 +505,7 @@ if [ "$unprivileged" = "yes" ]; then [ -z "$prefix" ] && prefix=${HOME}/pkg elif [ -z "$prefix" -o "$prefix" = "/usr/pkg" ]; then prefix=/usr/pkg + [ -z "$sysconfbase" ] && sysconfbase=/etc [ -z "$varbase" ] && varbase=/var fi checkarg_sane_absolute_path "$prefix" "--prefix" @@ -510,9 +516,11 @@ checkarg_sane_absolute_path "$prefix" "--prefix" if [ "$prefix" = "/usr" ]; then [ -z "$pkginfodir" ] && pkginfodir=share/info [ -z "$pkgmandir" ] && pkgmandir=share/man + [ -z "$sysconfbase" ] && sysconfbase=/etc else [ -z "$pkginfodir" ] && pkginfodir=info [ -z "$pkgmandir" ] && pkgmandir=man + [ -z "$sysconfbase" ] && sysconfbase=${prefix}/etc fi infodir=${prefix}/${pkginfodir} mandir=${prefix}/${pkgmandir} @@ -1087,6 +1095,9 @@ fi # save environment in example mk.conf echo "PKG_DBDIR= $pkgdbdir" >> ${TARGET_MKCONF} echo "LOCALBASE= $prefix" >> ${TARGET_MKCONF} +if [ "${sysconfbase}" != "/etc" ]; then +echo "SYSCONFBASE= $sysconfbase" >> ${TARGET_MKCONF} +fi echo "VARBASE= $varbase" >> ${TARGET_MKCONF} if [ "${sysconfdir}" != "${prefix}/etc" ]; then echo "PKG_SYSCONFBASE= $sysconfdir" >> ${TARGET_MKCONF} diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index c8b246b6e46..b7df6532331 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.317 2021/01/15 19:47:33 schmonz Exp $ +# $NetBSD: mk.conf,v 1.318 2021/05/30 23:41:05 khorben Exp $ # # This file provides default values for variables that may be overridden @@ -489,6 +489,12 @@ PKG_RESUME_TRANSFERS?= NO # Possible: yes or no. # Default: no. +SYSCONFBASE?= /etc +# This is the config directory under which system configuration files are +# expected. +# Possible: any path you like +# Default: /etc + PKG_SYSCONFBASE?= ${PREFIX}/etc # This is the main config directory under which all package configuration # files should be found. @@ -500,12 +506,12 @@ PKG_SYSCONFBASE?= ${PREFIX}/etc # Possible: any of: rc.d, smf # Default: Platform-dependent, otherwise rc.d -RCD_SCRIPTS_DIR?= /etc/rc.d +RCD_SCRIPTS_DIR?= ${SYSCONFBASE}/rc.d # This is the system rc.d script directory in which all rc.d scripts # expected to be executed at boot-time should be found. Package views # users may want to set this to "${PKG_SYSCONFBASEDIR}/rc.d". # Possible: any path you like -# Default: /etc/rc.d +# Default: ${SYSCONFBASE}/rc.d PACKAGES?= ${PKGSRCDIR}/packages # Stores generated packages diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index a6df693effc..3558f92c749 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.74 2020/05/09 16:48:57 rillig Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.75 2021/05/30 23:41:05 khorben Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -146,6 +146,7 @@ INSTALL_SRC?= ${_INSTALL_TEMPLATES} # FILES_SUBST+= PREFIX=${PREFIX:Q} FILES_SUBST+= LOCALBASE=${LOCALBASE:Q} +FILES_SUBST+= SYSCONFBASE=${SYSCONFBASE:Q} FILES_SUBST+= X11BASE=${X11BASE:Q} FILES_SUBST+= VARBASE=${VARBASE:Q} FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q} |