From nobody Wed Mar 27 08:35:42 2024 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 4V4KkQ37Swz5Gk84; Wed, 27 Mar 2024 08:35:42 +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 4V4KkQ2fZKz4KBL; Wed, 27 Mar 2024 08:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528542; 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=sk42JT9vANqxgWQEwc7LWfVEsvZWLnWp520t3K+6EkU=; b=XSWP5KB2zaJWwm8pqvi4Mwv8sSm38w3jbIqwP9Nyyqo8ZPL2TOSE5Tz36qbOBtvIL7ohRo 3sCdF3uiFBs1xPu9W3BnCm2WUKpmIRCrZmqbcSwb2wXz+APyvlaLYDIMUza4eI3Lm/9iJb Y3HlniCpg4hLOr54A9q2EIwEvrk37x1EPub3V1X4KMw/eD47KxL8QmUx62stwK6nJ5r0fl 4KhpNevQbV+caVlFGo35X5I1jT8nTF37zUsDjgqrnTzN1RZJAUgbw4NsrW5no8UMSI6hQd jtypL9RxdhlxrKnxX1dmRsMBIaDyCqBNvlWrLDvLk6vXS1fJHBP1R6T7etPxpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711528542; a=rsa-sha256; cv=none; b=jJ63x3FU93fnZfXd0qD6CzcNES3R1lNdp5KdDXBLfW4VkVOSI6cUeYBLk/2l/zmviMRBsS 7SMjCk0icfWdPngFnuNCaCrupMJBGI0dD8Lb8DfOaL/fj7k5ghIaVaD7bQJolGZ5GaJ0iA lxOVEUhdm4Stob6ynBflwUViB3HkVSvXds4opkTL8eXEf8FPZzlyhq45yPMIzzjyHdFI4N ulbnH3sCM7AurjhAHix1pj/rjTPfz+dtdkzyqz91nofJIAPsHHWUmJjEb9MeeBBMTjnIbY 3m+pIZ13+gG11baRF7AfTYn+DHP/OrWugXas0xNMkHuD7W8P2FrM31edqh1DyQ== 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=1711528542; 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=sk42JT9vANqxgWQEwc7LWfVEsvZWLnWp520t3K+6EkU=; b=fHOJ0bJSL7iC27IbWK2Vw8VXwErdwKNRo6Ula2P28G70Gfv2rSn3RWE7NRQnp95Rd8Yq3l mLzoYoGAaqdEhh0RbEb1D/LDd8rkpaddToB2t5XYFTyA3d3u8MGizF2GoiyfnwA/KGToN4 ER0C4rISAXHKWVBc1Vsmo8ZbXr4PJvwYwdcjQeXIM/ntlCV4/OY8fS+Y32sJiBsN2wRUn1 i0ya4jPiTRffwIE20EL89nLGmg5SrRp1Wu8AkYOE6IQoydfgDx45/EF6uMHraH+W2sj0B3 lcHKDsJUA2zow/OUC2Fd7yVdsocXv9DpprqheBPPTwSl0Bp8qCMRxwJ79v34sQ== 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 4V4KkQ25VQzcLN; Wed, 27 Mar 2024 08:35:42 +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 42R8Zgpa014955; Wed, 27 Mar 2024 08:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R8ZgP2014952; Wed, 27 Mar 2024 08:35:42 GMT (envelope-from git) Date: Wed, 27 Mar 2024 08:35:42 GMT Message-Id: <202403270835.42R8ZgP2014952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 69cd13d49c04 - stable/14 - pkgbase: fix kernel packing after switch ucl rework 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69cd13d49c049846088f3fe6c8b48c2467e13dd0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=69cd13d49c049846088f3fe6c8b48c2467e13dd0 commit 69cd13d49c049846088f3fe6c8b48c2467e13dd0 Author: Baptiste Daroussin AuthorDate: 2024-03-19 09:00:15 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-27 08:31:48 +0000 pkgbase: fix kernel packing after switch ucl rework (cherry picked from commit 76229061601f495d3c80fdca5914e394e71ec07a) --- Makefile.inc1 | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0cf5bc1dec6e..43fb226a0af7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2226,17 +2226,18 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \ - -e "s/%KERNELDIR%/kernel.${_kernel}/" \ - -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ - -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ - -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/kernel.ucl \ - > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "kernel-${_kernel:tl}${flavor}/" \ + PKGGENNAME "kernel" \ + VERSION "${PKG_VERSION}" \ + KERNELDIR "kernel.${_kernel}" \ + DESC "FreeBSD ${_kernel} kernel ${flavor}" \ + COMMENT "FreeBSD ${_kernel} kernel ${flavor}" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ awk -F\" ' \ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \