From nobody Thu Sep 25 01:01:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cXFm52qd4z68k9q; Thu, 25 Sep 2025 01:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXFm456xcz3bQV; Thu, 25 Sep 2025 01:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1mzyyC+ZKWPwrhw/Yxs552gtHfe4tlqJKMEuWVscyE=; b=x3W2C9seckJzOdg0MU+k5WCgbnlQw2RdzXoHSgnHjC4sC9/uR3zB0w53ECvB+b4A2wGhlw dIxx26Rc3AUbije19rIOi447l7qkfXSdovtDdCzgOQTZ8kFZ9A2MUhb4SK3ULQdUgEQy2v cJRrQk1rUCRcGYRs8BFSt79MseZ86k9kaZuNTSojPO2PbnqSzKvkPMbLgPlXUMDi/JR8ZW 3N3/+CvF0QKMrgg+kADmIQx8HQaQLN4d9Z8z6kKS07fPeuKBZr7Im7Huxmr1FGWADcBp7L 3DpZe0xsMbr1+OjnD+xiMY+l9rsT6xSxFlwsMpHyLvAHVX1ZES31gd7huBkynQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1mzyyC+ZKWPwrhw/Yxs552gtHfe4tlqJKMEuWVscyE=; b=VkLv3dKZpMmyOU/9PV3TiFz7O+vo4hncfmkdx+fyj8NjSl5ukjv+eidcdyEptHhxvwByj5 GrldLicMpppFl4a0k0WafYmYGbOFKVmDinSHewXHMaPL5hgyEVyzbdxMLB7sN5rprAKp9Z fTG4eoiLDi66cLNzPEcxivtOtcLpNI5wWxpauhNlv6pbojdOpffhbFi62aFt8XeSBH9GPl jyrYrcu2xRHeBrzrUMTZeTsDfHoBeSbXax5adS+2G71wO4xe2elb9jfmVNeZKLEk39hziD xG8ktcMdWqT5SRcoonMSXXXgfikgO1HVh3wVBPy32IRzITSKfsV1as8nX6dx6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762100; a=rsa-sha256; cv=none; b=m+gVmMKcn6hfTpmhRxIw/lBeYXTxe/FQAzGtAID2F2fleJ26tgRFeF5PFucM9F+ZdNXxqX opzLkcGwBP2CymYCI1x7PZ+s8aweKevXCQd1jQJRovVrOHcicQr8ZSwN9evuKaOiT6NUiy wW3rlkaPdHFX6hgIU4Zqz6jfLHDcT8+Rmk2HDwg4uYbDnr+6l77OM/lUVRQNtzlR87/LTj bx+FyDq4hhp/xQ7WbJBMICBVK4PwRDR320GpV37GR64ytR/eNhEUc3kk0kxgjD1dlQRIE7 PuanCxjdQMGrc2XyvpKH4Z4bWOLUSMPj9oag0fJOko/eIArBS6724morgrP8cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cXFm43mMGzwCH; Thu, 25 Sep 2025 01:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58P11eho086926; Thu, 25 Sep 2025 01:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11e1g086923; Thu, 25 Sep 2025 01:01:40 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:40 GMT Message-Id: <202509250101.58P11e1g086923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 46a4ee6e6e67 - stable/15 - Makefile.inc1: Fix package-pkg with a non-default LOCALBASE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 46a4ee6e6e6770f2568a76a84464e5e97f45f2c4 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=46a4ee6e6e6770f2568a76a84464e5e97f45f2c4 commit 46a4ee6e6e6770f2568a76a84464e5e97f45f2c4 Author: Lexi Winter AuthorDate: 2025-09-23 22:15:35 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:41 +0000 Makefile.inc1: Fix package-pkg with a non-default LOCALBASE package-pkg (via make-pkg-package.sh) passes CONFIGURE_ARGS to make when building ports-mgmt/pkg, which overrides the port's default configure args that are supposed to set --prefix. This means that pkg is always built with the default prefix of /usr/local, which then fails when ports tries to package it from LOCALBASE. Work around this by explicitly adding --prefix to CONFIGURE_ARGS. MFC after: 1 day Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D52634 (cherry picked from commit f259daa708f507d3ff450d2eb8c05065674339ec) --- Makefile.inc1 | 2 +- release/scripts/make-pkg-package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 94c33ca791fd..e98b5f233b51 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2049,7 +2049,7 @@ package-pkg: _pkgbootstrap _repodir .PHONY env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ - OSVERSION="${SRCRELDATE}" \ + OSVERSION="${SRCRELDATE}" LOCALBASE=${LOCALBASE} \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh .endif .endif diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index ee75e7d68d14..a1e006bd6964 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -13,7 +13,7 @@ export DISTDIR=/tmp/distfiles export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES -V WRKDIR) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION}" \ + CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION} --prefix=${LOCALBASE}" \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES \ BATCH=YES stage create-manifest