Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B835784D69 for ; Tue, 27 Jun 2023 14:36:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YhYXbFrAAkzJ for ; Tue, 27 Jun 2023 14:36:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 36DCE84D14 for ; Tue, 27 Jun 2023 14:36:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 33FF1FA89; Tue, 27 Jun 2023 14:36:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168787660141820" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 14:36:41 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/bootstrap To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627143641.33FF1FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168787660141820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 14:36:41 UTC 2023 Modified Files: pkgsrc/bootstrap: bootstrap Log Message: bootstrap: Override NATIVE_PKG_*_CMD, not PKG_*_CMD, during build. NATIVE_PKG_*_CMD is what gets executed at build-time, and must be the bootstrapped pkg_install which lives in the working tree; PKG_*_CMD may get baked into packages for use at run-time. To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 pkgsrc/bootstrap/bootstrap Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168787660141820 Content-Disposition: inline Content-Length: 1526 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/bootstrap/bootstrap diff -u pkgsrc/bootstrap/bootstrap:1.318 pkgsrc/bootstrap/bootstrap:1.319 --- pkgsrc/bootstrap/bootstrap:1.318 Fri Nov 11 17:22:14 2022 +++ pkgsrc/bootstrap/bootstrap Tue Jun 27 14:36:41 2023 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.318 2022/11/11 17:22:14 jperkin Exp $ +# $NetBSD: bootstrap,v 1.319 2023/06/27 14:36:41 riastradh Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -1370,10 +1370,10 @@ run_cmd "$install_sh -c -o $user -g $gro run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin" run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create" run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info" -echo "PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF} -echo "PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF} -echo "PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF} -echo "PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF} +echo "NATIVE_PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF} +echo "NATIVE_PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF} +echo "NATIVE_PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF} +echo "NATIVE_PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF} MAKECONF=$wrkdir/mk.conf export MAKECONF --_----------=_168787660141820--