From nobody Wed Nov 04 15:43:27 2026 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 4jKV8b74LTz6y5Qg for ; Wed, 04 Nov 2026 15:43:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKV8b6H6Lz4gHC for ; Wed, 04 Nov 2026 15:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793807007; 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=dMicq5fT5n/R3Jwy3hQJsM4oR5nSVxpdconzuEEcBOg=; b=as6WVppqQb7F8xPkaGIHlZF8Zk1HNIzt/ginesHGy2WCbvAMDFgE7TV7bSrfq9t4hwc04D /vaep4jW8vZmIv86TFSHkUMQd/6KyS5ag7uxMTx6WFs2s5TX9WG7P9q22buU6RwNYmMQKt n7KER2BGmQ8w9Ukuna10xUg33QA7bO1Q0LWM8gL5NLx1LWfNFqoFg43AYUyf4d+VWPeDp1 nKrDyLc3rzyUeJb5mjYeI1kmPAfV2ptG0bFeg3XtVfVptCGXDR8z1wMjXuTdUK/o7yA0Eq bNMM6gGnzsleyWn4gpd12GAxNyv+nWvFnrdHLUa9NVV6bzF4qXodw6MoNamOCA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793807007; b=TNAJVOOqzPq/siqvRAPSCoYqle2xk3KRE4XZgP+AVQP/+SZbOF209qwFKA9OxLEO3SHl2S femANyBhOlsEPfMhl8+1hkOzdUwqtOl7eCqKMKx3wd8wUYszqxvAba9lxSGs5qZclxQnEH 4sslIKc5tH9fBDU0sXWL6XhbSDES+8TQ8pYJMachz07MpI4uX9Z/RcZLWbH1CKsQXDoS1s a5tkoiy4hp9D4rE8bnfwXLsD9mp/G1d8cQtYACFKqQDwQP/bSV+M7GCJDHUdXpRKzvqiBg kFj8zdfFzeoqp2NwkvePHpO9qUN0xR4jrs34gXWTgXtq1Xq26JBPpWAx+xuIJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793807007; 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=dMicq5fT5n/R3Jwy3hQJsM4oR5nSVxpdconzuEEcBOg=; b=b00f8JIPtdFNG75DscWPj9P8Cc1Jk3WAD6/KhZCsRzuZ2R3UfKIMOgW9YF473eMNoxeXfR RA52Z+Pn7YNA5TQjwaIanwHO3U0EIdBNpcSkgsX0SzQVsY2lZYOuejBcap45SR7hXBEHfY 1AqxesAPBvWjx2XHzNFyn93rAnk2eM5q/dbFYalZF9BC/d5wMDnYhN7hlQ1hRNpKtMsYGp 6QRyDtd0bzoKoI+0+v8i3aCi34Yw6SjZIdyG811VsmmrrrVS3UTwSRPx681kAsGtyZCs+N 7qAcKFceCDdmBd4d4GlXq7wEGDMeLOErSpVzZvsv3aUWyC4KpC1nigMqbRAfZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKV8b5xRJz18WQ for ; Wed, 04 Nov 2026 15:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19b71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 15:43:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c1ed6dd4dfa2 - stable/15 - Makefile.inc1: Fix bare $ characters List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c1ed6dd4dfa2576d88d737a54abfc85aefa98acc Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 15:43:27 +0000 Message-Id: <6aeb529f.19b71.1ce0c839@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ed6dd4dfa2576d88d737a54abfc85aefa98acc commit c1ed6dd4dfa2576d88d737a54abfc85aefa98acc Author: Colin Percival AuthorDate: 2026-11-03 18:31:35 +0000 Commit: Colin Percival CommitDate: 2026-11-04 15:43:20 +0000 Makefile.inc1: Fix bare $ characters The '$' characters inside awk commands need to be $$ when appearing inside a Makefile. Without this, we generate empty src and src-sys packages. Reported by: Stefan Grundmann Fixes: a8be89928930 ("build: Support got") MFC after: 1 day (cherry picked from commit 6a99232c75f6460b03a95019e2625828a158d457) --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 066739a535c6..dcf67d5b9ce2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2229,7 +2229,7 @@ create-source-src-package: _pkgbootstrap .PHONY @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ ${GOT_CMD} tree -R | \ - awk '/^sys\// { next } { sub(/ -> .*/, "") } /\/$/ { next } { sub(/[*@$]$/, "") } { print }' | \ + awk '/^sys\// { next } { sub(/ -> .*/, "") } /\/$$/ { next } { sub(/[*@$$]$$/, "") } { print }' | \ sort ) \ > ${SSTAGEDIR}/src.plist .endif @@ -2265,7 +2265,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ ${GOT_CMD} tree -R | \ - awk '!/^sys\// { next } { sub(/ -> .*/, "") } /\/$/ { next } { sub(/[*@$]$/, "") } { print }' | \ + awk '!/^sys\// { next } { sub(/ -> .*/, "") } /\/$$/ { next } { sub(/[*@$$]$$/, "") } { print }' | \ sort ) \ > ${SSTAGEDIR}/src-sys.plist .endif