From nobody Sat Jul 22 03:24:30 2023 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 4R7BcG2shdz4nlc2; Sat, 22 Jul 2023 03:24:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R7BcG2R6Jz3FcS; Sat, 22 Jul 2023 03:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996270; 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=giYxzGtrkA231XYRh5ELRtaaBnQC4rSePZK97nWzwJk=; b=WLjBBY9SWil0fvL0zXhFLa6ki7orXJTNkslW1llvqZxR7CjaOndPxuk4JnD+JEOJ7wjR87 8sOIE4vbCPzvno6PYWBHdD7iGKR1GKbYcWKo98WAWv/NIdRNpnrumvRa6j3k7fCuu7yrtx vXYn9t4nSvpsc9mq0jtpzF7dYrZyljZHTyfxrnhcAr5AdWYOAi9XlXgWYGF67LslEN/1rx AmOYilf870xtUCqpFuHyF7TWrRsdIWUftXntcJrtzES10UTWrapyrs+O9oLLcq81J4O0tn snNeiIDnzojBdoVeXjIcSbRovhycxrw0Ywj1KOTREAL6SG0QRCLBTz8CwiN+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996270; 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=giYxzGtrkA231XYRh5ELRtaaBnQC4rSePZK97nWzwJk=; b=xlYYIg9AHGZEwKOEICM8X7UflTkrirqZl9N6zqhCzGmO3LKsnyoLGJBRFgOYtVsycZPENp 7w7wkKaoNVczmm9FulNYd1uNPQ++F9CUlycB32cWzQAyBElm27/HCfxmXZ5w3c315GAxxf wjtIzvwWWiOthuhiIwaA03X7JLajhbkUbupVvQcdMwB6v2rhLdlfjtPo6gcCo+qMDCcK5l 6ebFBKPW1rFmZFQ9PHifif4az7x/yCh/G4Qx0TSY7abO6QeIM9bMJ2fxgfeu9tAuc0I6vv BfT8rJ9A8NT/uJAs/p2UxcjmxIi3mFWsfPqCQ2kU7aHUKLDse01REam2woI87Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996270; a=rsa-sha256; cv=none; b=E+gHh00Esbn7ARWxo9UL6AnuHU4IWG0oRTTktrTlgTRP5kfyxaWFH4vR/hoZkp+Sv0yW9w nW4XGF/DLDU+lEgBBsDIHTsZYEANqR5JgyI+TmGV5X2sMGgPThFi7QNcvGXkYrFQ+ISyTL hKt2xmYU+cOW/D9Cj08z9/V3Dv6GUDW7xjflX9QOEZFZjve83zsMCSyY4zV/y1nBN79fY+ eW0H5dYMcfk7fwDabtj0ZtVzJoudMUtst9ZW2WPV1ZLdHq2lz3O4C6IaMkNV+iX+SYZ1iv HXEWePFFagj5vkXrriB+iLQKOfiLPrqAbVngjA5912EvHkx2Ke3a0qTtXWTYoA== 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 4R7BcG1Cy7zfFx; Sat, 22 Jul 2023 03:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M3OUiH085844; Sat, 22 Jul 2023 03:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OUdk085843; Sat, 22 Jul 2023 03:24:30 GMT (envelope-from git) Date: Sat, 22 Jul 2023 03:24:30 GMT Message-Id: <202307220324.36M3OUdk085843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 1feb6f1cbe06 - stable/13 - release: sprinkle UNAME_r hacks following c883b6fd8ccd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1feb6f1cbe06c0b6dbbb96b4d195813e129c634b Auto-Submitted: auto-generated The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=1feb6f1cbe06c0b6dbbb96b4d195813e129c634b commit 1feb6f1cbe06c0b6dbbb96b4d195813e129c634b Author: Glen Barber AuthorDate: 2021-03-04 14:22:45 +0000 Commit: Glen Barber CommitDate: 2023-07-22 03:18:43 +0000 release: sprinkle UNAME_r hacks following c883b6fd8ccd Pass UNAME_r override to make(1) for ports builds when building ports for another branch. Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd (cherry picked from commit 63749bfe96b792b3a435f84ad81a47888cae1dea) --- release/Makefile.azure | 2 +- release/Makefile.ec2 | 2 +- release/Makefile.vagrant | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index de95a944f9c7..32e91833b766 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -39,7 +39,7 @@ azure-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y www/npm . else - make -C ${PORTSDIR}/www/npm BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean . endif . endif npm install -g azure-cli diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 035137e61d53..e26f4f705cc6 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -45,7 +45,7 @@ CW_EC2_PORTINSTALL= cw-ec2-portinstall: .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) - env - PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean + env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean .else . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 4abcaa891ed3..d49eedacb6c9 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -58,7 +58,7 @@ vagrant-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y curl . else - make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean . endif .endif