summaryrefslogtreecommitdiff
path: root/mk/pkgtasks
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2017-08-10 05:41:52 +0000
committerjlam <jlam@pkgsrc.org>2017-08-10 05:41:52 +0000
commit4b9ae519d0e5a460e90578b24cf7cb44887d50d0 (patch)
treea82c35322eec92f84bc12d5b3fd9b2cad6e3ae6e /mk/pkgtasks
parentdabd7bdc340729b07f1a50d8bef756335f2af14c (diff)
downloadpkgsrc-4b9ae519d0e5a460e90578b24cf7cb44887d50d0.tar.gz
mk/pkgtasks: Failures in POST- stages of the scripts are non-fatal.
The return values of the postinstall and postremove meta-tasks are ignored unless the user-settable variable ${PKG_FATAL_ERRORS} is "yes". ${PKG_FATAL_ERRORS} defaults to "no" to preserve the existing behavior of install scripts by mk/pkginstall.
Diffstat (limited to 'mk/pkgtasks')
-rw-r--r--mk/pkgtasks/bsd.pkgtasks.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/mk/pkgtasks/bsd.pkgtasks.mk b/mk/pkgtasks/bsd.pkgtasks.mk
index e577bef8f31..1ef98d720a5 100644
--- a/mk/pkgtasks/bsd.pkgtasks.mk
+++ b/mk/pkgtasks/bsd.pkgtasks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkgtasks.mk,v 1.5 2017/08/10 05:41:07 jlam Exp $
+# $NetBSD: bsd.pkgtasks.mk,v 1.6 2017/08/10 05:41:53 jlam Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -52,6 +52,13 @@ _VARGROUPS+= pkgtasks
# Possible: yes, no (case-insensitive)
# Default: yes
#
+# PKG_FATAL_ERRORS
+# User-settable variable for whether the return value of the
+# {pre,post}{install,remove} meta-tasks is used or not.
+#
+# Possible: yes, no (case-insensitive)
+# Default: no
+#
# PKG_INIT_SCRIPTS
# User-settable variable for whether to copy init scripts into
# the appropriate places for the init system to locate them,
@@ -81,12 +88,14 @@ _USER_VARS.pkgtasks+= PKG_CONFIG PKG_CONFIG_PERMS PKG_INIT_SCRIPTS
PKG_CONFIG?= yes
PKG_CONFIG_PERMS?= no
PKG_CREATE_USERGROUP?= yes
+PKG_FATAL_ERRORS?= no
PKG_INIT_SCRIPTS?= ${PKG_RCD_SCRIPTS:Uno} # deprecated
PKG_REGISTER_SHELLS?= yes
PKG_UPDATE_FONTS_DB?= yes
FILES_SUBST+= PKG_CONFIG=${PKG_CONFIG:tl:Q}
FILES_SUBST+= PKG_CONFIG_PERMS=${PKG_CONFIG_PERMS:tl:Q}
FILES_SUBST+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP:tl:Q}
+FILES_SUBST+= PKG_FATAL_ERRORS=${PKG_FATAL_ERRORS:tl:Q}
FILES_SUBST+= PKG_INIT_SCRIPTS=${PKG_INIT_SCRIPTS:tl:Q}
FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:tl:Q}
FILES_SUBST+= PKG_UPDATE_FONTS_DB=${PKG_UPDATE_FONTS_DB:tl:Q}