From nobody Sat Jul 22 03:24:32 2023 X-Original-To: dev-commits-src-branches@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 4R7BcK186wz4nlYR; Sat, 22 Jul 2023 03:24:33 +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 4R7BcJ4Z6Dz3FbD; Sat, 22 Jul 2023 03:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996272; 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=fXKJGUJ2ng3cw0Rvm59JY78rvIBX5XUO9m41WKYmwO0=; b=i70Rxz6ubpncQ7tJez9CunzshrydGEiDJQxjpHmKgDhxUAgJC1FKASGsV/H8BfzQ3kHb9L SQIIkwxkSCimY7PKv+UnFfzDw10Ezh8dE+8/jkWT2Fc2VyHjLZ5MiFUglDCumHjPf1dHpj iPTnGjfJ5sshdC7TtrgL6u51+YpMKIstXtrmbc3aHQ/4ES3ffvwQVVVgKEaltT9ywAFpQX BkKT2WniwAenUwSjQLjRmdOAamRoXnTzDyPj7sZ4FdP+xGrhJYdV7jB+TYWiqPifBiIOvu Bmn11lcofher1DEKa/ofSMwDcFjFuxGWpMl2+A4745SIgNhz3wxTtgi3r6gmng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689996272; 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=fXKJGUJ2ng3cw0Rvm59JY78rvIBX5XUO9m41WKYmwO0=; b=fEeMnjlQ5PcfP0ec7iWxImdTPP+SEa+m0hOvoluZydFDYLruvV/GmcuxvE2Y5lsiP9EWJy 6GerCJDaklYGtZ9+mhX7rQnUhMpPOBSsILcxNJDOogKmSnOvKxCtn5dF5cF7LZ6VF7c0s+ L2fFjs3Z99IKyYa2trZkguEXmjKGwxmKvyqkt6XtE5xhbP3xzcZ38D7UY03nsbcv7wt6EP C4IlNpLkt2q2ZX43eUJTxdCH4tiks3KARkD0zyZLfi9bN6HNj9IRC8kPhjKhFS+2LEwrTG wg+PJ3IT8vk/FeGJeYSbw4/tDYWZYFUWszXT+oV1g6bPlDajzpvRCUbkR2EdZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996272; a=rsa-sha256; cv=none; b=bDoAhybG2TkMSCuPmfduEw+fEnR4a4Amx32Ff3FOsrUq9OznkwXAsBk3Loqpr17AUqdJcp F+Nm+tCReQMOWRmizaUXcRNaTSjsy28nHM8c0zPLZ1B+/4nOv8x9R5x04Brqq59EnWO4iV /zcSLjsI2UA1tb1mv2x8uhotSNTDh/Hxy9RWM+yZMvE6qTm8WNLpxLyYTgP4c80qk8ZSaU quPv73SgrxPLZlRMc0jeb0LnZx15SUegyXft49qqu9xoq/h4EKuc+AZDnV9oCPekul1sx/ 68LU2hkcnDn/QKzgZygbBf/tah97VQT/A/BOb+bOWM71F5V6kRalOvseuJcBzQ== 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 4R7BcJ32pMzf66; Sat, 22 Jul 2023 03:24:32 +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 36M3OWb6085882; Sat, 22 Jul 2023 03:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OWK9085881; Sat, 22 Jul 2023 03:24:32 GMT (envelope-from git) Date: Sat, 22 Jul 2023 03:24:32 GMT Message-Id: <202307220324.36M3OWK9085881@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: 638dd626370e - stable/13 - release: Adjust where UNAME_r is defined for ports builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 638dd626370e43e06ed0dfdb7e167290300fc01e Auto-Submitted: auto-generated The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=638dd626370e43e06ed0dfdb7e167290300fc01e commit 638dd626370e43e06ed0dfdb7e167290300fc01e Author: Glen Barber AuthorDate: 2021-03-02 15:11:04 +0000 Commit: Glen Barber CommitDate: 2023-07-22 03:20:13 +0000 release: Adjust where UNAME_r is defined for ports builds In followup to 80ab50e1de19ca125f05a13937c796d48c4edd4a, export UNAME_r in Makefile.inc1 instead of Makefile.vm. Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd (cherry picked from commit 0be274d3737972532c042d06c53b5807e95aa845) --- release/Makefile.inc1 | 3 +++ release/Makefile.vm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.inc1 b/release/Makefile.inc1 index da7226dfa890..99d61a45e700 100644 --- a/release/Makefile.inc1 +++ b/release/Makefile.inc1 @@ -40,3 +40,6 @@ BUILDDATE!= date +%Y%m%d .export BUILDDATE .endif +# Override UNAME_r to allow building ports for a different branch. +UNAME_r= ${REVISION}-${BRANCH} +.export UNAME_r diff --git a/release/Makefile.vm b/release/Makefile.vm index c652d393d64a..abd5f4c5de00 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -58,7 +58,7 @@ emulator-portinstall: .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) - env - UNAME_r="${REVISION}-${BRANCH}" PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean + env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y