Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Mar 2024 14:07:57 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 02b25ccfc0b1 - main - pkgbase: fix packaging of dtb
Message-ID:  <202403191407.42JE7vwt049270@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=02b25ccfc0b13759ce04c291b6569dcfa22a9fa0

commit 02b25ccfc0b13759ce04c291b6569dcfa22a9fa0
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-03-19 14:06:02 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-03-19 14:07:28 +0000

    pkgbase: fix packaging of dtb
---
 Makefile.inc1 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1f1418c0eadb..0c9213ea5104 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2187,16 +2187,16 @@ _debug=-dbg
 
 create-dtb-package:
 	@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
-	sed -e "s/%VERSION%/${PKG_VERSION}/" \
-		-e "s/%PKGNAME%/dtb/" \
-		-e "s/%COMMENT%/FreeBSD Devicetree Blobs/" \
-		-e "s/%DESC%/FreeBSD Devicetree Blobs/" \
-		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
-		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-		-e "s|%PKG_WWW%|${PKG_WWW}|" \
-		${SRCDIR}/release/packages/dtb.ucl \
-		> ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \
+	${SRCDIR}/release/packages/generate-ucl.lua \
+		PKGNAME "dtb" \
+		VERSION "${PKG_VERSION}" \
+		COMMENT "FreeBSD Devicetree Blobs" \
+		DESC "FreeBSD Devicetree Blobs" \
+		PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \
+		PKG_MAINTAINER "${PKG_MAINTAINER}" \
+		PKG_WWW "${PKG_WWW}" \
+		${SRCDIR}/release/packages/template.ucl \
+		${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \
 	awk -F\" ' \
 		/name/ { printf("===> Creating %s-", $$2); next } \
 		/version/ {print $$2; next } ' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403191407.42JE7vwt049270>