summaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-08-27 13:25:24 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-08-27 13:25:24 +0000
commitbee3d446c4cd1c4317918c407551f3c197ff17db (patch)
treee841fed69e1aabe3ad091c79a4ae45920000f6a8 /release
parent2b65ed0302f8339db05640c6ee2bed16458c6e4b (diff)
downloadsrc-test-bee3d446c4cd1c4317918c407551f3c197ff17db.tar.gz
src-test-bee3d446c4cd1c4317918c407551f3c197ff17db.zip
Fix passing OPTIONS_UNSET with multiple options to make(1).
While here, adjust the copyright. Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/projects/release-git/; revision=364862
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/release.sh b/release/release.sh
index d7320b81a6ce4..185a7d08c235a 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#-
-# Copyright (c) 2013-2018 The FreeBSD Foundation
+# Copyright (c) 2020 Rubicon Communications, LLC (netgate.com)
+# Copyright (c) 2013-2019 The FreeBSD Foundation
# Copyright (c) 2013 Glen Barber
# Copyright (c) 2011 Nathan Whitehorn
# All rights reserved.
@@ -275,7 +276,7 @@ extra_chroot_setup() {
GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
- eval chroot ${CHROOTDIR} env OPTIONS_UNSET="${GITUNSETOPTS}" \
+ eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
WRKDIRPREFIX=/tmp/ports \
DISTDIR=/tmp/distfiles \