From nobody Tue Mar 19 09:04:53 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 4TzQln3q2Qz5DtBv; Tue, 19 Mar 2024 09:04:53 +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 4TzQln3HxLz4VvQ; Tue, 19 Mar 2024 09:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710839093; 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=0SIwB0ywwFBb72cEA7eNJ+e3Tu1y+C/Bei1NMw/gXhQ=; b=muMKHl10q5xDukHN/FetjHtnLEQ0rOdqv7c9yde2t3NwzMl8FiE7IG1m3fr9EMwGk7Pifz Lx+FQWSiYDS5ir67Vkn8TJfIdIDlMDyY3qINqFUqt6QHwNx7n3n9IYbwDclKk40Wz5YBrq kMa9uAbhKq12TgAyMdy2nQugSAIN4j1hBZyMUWl9Q5TyOsKJHyZa143SB39uMUBJwM1pV6 UQ6yhKkQkTYZyouyGdIWhsO8UtsYMLLsQkg+pSgzuBSPvaIlHlHpMWW1V7ZnuF/6TM1+hy BZAf6rfvMUW+P65mHY/nxRb7WXsT0aPkT3G4NbEXBm8P38gI9VOQGwvuV+ac1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710839093; a=rsa-sha256; cv=none; b=Vi6ma+0ZEcOdK0336i9gIXuRS9RfWDYbDtkqEutPBEOUCpFjxnDLtXyTFCA2cFfPrNMORY HfA7R1e5hYJfNglq0eMw6JZR0QRX29b6NhSCzXrtDjhdC+OaTeIelwk3kg1UZi2AFApVNr dikb/PC4Ev1PXBoox0eo2hz05s3eigiFoV/MGyugaAn+aDC6cG7E1T6EZ2S0CL+5LtIytF bm3w7TNIUJsLdwE328GaRMYSbt+BPupIRZ3jePqDmUWbePIluSDxjReyKqYCQjaGs3sm/l N6/bbFUAxo2Txf9pU8jOxZCIuRuihA4adASxcN/vr1lH4iBS+/X1nKjqxLZuuQ== 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=1710839093; 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=0SIwB0ywwFBb72cEA7eNJ+e3Tu1y+C/Bei1NMw/gXhQ=; b=aozFueFiupSyJsF4Rbk49C0padxjNdGqBI/hcSQTB1UlqBKrNT/Pn6vm10x5U1vrQ1SXho fxxtyqCi4bO5AvhYYk0q7zZcMXh0uQJ/W88/RFFLNNNEyWQVSGWtzDgMZt1UyaW9iwx4fm hTZ0CHp7EV+84US04TNRzLJUQb6tho8Rgwor0t7On0RlNgVLHI69beYa226SqQUaAIVLlV +ylDOcbUsmjbya/pTf1WwmWuyGrfTCbYcKMXxWzMtyOq9ZREX+FDSJ7HignZYFlBoi8+PL xMVTT2sGubGU5xv9F/l34H5F29PILPxIMbbvhdrnh+D8geXwz+4p/NL2uz4tCA== 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 4TzQln2v4Zz11pg; Tue, 19 Mar 2024 09:04:53 +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 42J94rKg044071; Tue, 19 Mar 2024 09:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J94rCh044068; Tue, 19 Mar 2024 09:04:53 GMT (envelope-from git) Date: Tue, 19 Mar 2024 09:04:53 GMT Message-Id: <202403190904.42J94rCh044068@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: 76229061601f - main - pkgbase: fix kernel packing after switch ucl rework 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: 76229061601f495d3c80fdca5914e394e71ec07a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=76229061601f495d3c80fdca5914e394e71ec07a commit 76229061601f495d3c80fdca5914e394e71ec07a Author: Baptiste Daroussin AuthorDate: 2024-03-19 09:00:15 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-19 09:00:15 +0000 pkgbase: fix kernel packing after switch ucl rework --- Makefile.inc1 | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 003aaf513644..8bf8ad03a971 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2255,17 +2255,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 } ' \