From nobody Tue Mar 19 14:07:57 2024 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 4TzYTV1Qr9z5FQ3M; Tue, 19 Mar 2024 14:07:58 +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 4TzYTV0wyVz45nk; Tue, 19 Mar 2024 14:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710857278; 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=zB95e/CfvrbFoLvfLKl+M0quBbBkdRX27bA7L7r19oU=; b=OPFyvh4Avn7JDd9/eJBzHcOs2cajZP+cQMknV+cMIVyShTH34mr/mg43kc/bmMVyDay4Hy 8Rgw2c8ULFclHsUPJ6WMujEkMR2WVkbVqrSGCWTg4RYQBEh3F7vRxjrDe+lrdU6LkLCRgW yYfOU/vudbfwkVTz//is32YO+KsYMXoJ89AiM6eAQNCYaZ++GyBxEKzABm/mVdRQyyMuy1 RrQGvLBy1vxGLZqHWQMfRZ41w1QlbPNXjR3hyaxJX1Jq44IAnWxKQR3JDFE0bFfBZiZnbA eTK9RjRcxoHRRwciW1KpSiYQbFgqDk3uLcJIKNJSsqu0z/mlC57Lx9d3gjVIrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710857278; a=rsa-sha256; cv=none; b=VL6nlmfOaHvMMZf8JOd1kL7ptEI6C09wuxGu8qtlVEB9o39rbBt9HpKIrNe63iV2Ymf4+w UlW6VC+TUYe7rrwPSarpEMgajTR6u5eKW1v7ZxIRYs+CXrzYRU/V443CoGZRSeLvKE5+Fp mTFO3LLr+rf+8ckXGXPIllq8pTUmjWBZjKxxK/Qg4ZMvYBvkiJo4vOZVikbFaDUb6XDwNJ P3G6fPGrYPWaI7U98SzPGdIQYn/ZlavGhmBAjrpqggSErJvTAL+tmU5xdukRV+u0bM+QI4 cH3vqSeD5ftan7XkmO4f65b7psfRTnBSqrRCKl7PFFwiC7s21rPhIJQcHJoU1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710857278; 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=zB95e/CfvrbFoLvfLKl+M0quBbBkdRX27bA7L7r19oU=; b=C5/C/o4kCbIGeG1AbAKLhGR40edKiPuuB0byIrJl8RK6nQ0XDSGzMgsPMK7ioMV5s9ixZS +L4gSB8LoAbYK9wESvjeXT2kY5u4IEl8Qvruk1MVrWOg1K41UZENXz1g5x1dXLLZlTF6WN sRmifXZTkwnRxNS0a7AJo/Qm55Vc6fafUn/g0QP71aVdLYvB3g3vA8trfkSLytPAX+CSIZ Eqmt/dIMz7zdRhLvxtluxQ3fXxGrvXEODaRqifF+wNKa1FuPTHAg74Xmoh3vhUoe5c+2Mt YWVn5JvMNTTra6oUOjFTjlE/e6Fngkpvq+EuFkSytvM/Df7m2QQfZjywh1yFzA== 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 4TzYTV0Xy2z192X; Tue, 19 Mar 2024 14:07:58 +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 42JE7vr5049273; Tue, 19 Mar 2024 14:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JE7vwt049270; Tue, 19 Mar 2024 14:07:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 14:07:57 GMT Message-Id: <202403191407.42JE7vwt049270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 02b25ccfc0b1 - main - pkgbase: fix packaging of dtb 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 commit 02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 Author: Baptiste Daroussin AuthorDate: 2024-03-19 14:06:02 +0000 Commit: Baptiste Daroussin 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 } ' \