git: c1ed6dd4dfa2 - stable/15 - Makefile.inc1: Fix bare $ characters
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Nov 2026 15:43:27 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=c1ed6dd4dfa2576d88d737a54abfc85aefa98acc
commit c1ed6dd4dfa2576d88d737a54abfc85aefa98acc
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-11-03 18:31:35 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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