From nobody Wed Mar 27 08:35:44 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 4V4KkS5TD4z5Gk87; Wed, 27 Mar 2024 08:35:44 +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 4V4KkS4szDz4KLy; Wed, 27 Mar 2024 08:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528544; 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=wR1m8FSQWVs6doBAGvwbpqfGRECYGPCtcJrD1oe3WAg=; b=oDod8nRKveeip7wBWNGbNt6fcFkwhNM3i+UVE3KVs607dheQmpWDZ6zE208LhmMc8KcjJB 3f/D7MerxS2TlOMWrdYuhtMRy6xTOiAdTE09Gp+cIAbAeqW+bA3fdjngVhj1KxxpMPUWAQ VJEt6c8Eoqnw29pqNUoXS6YgprE5pq/vMorxap4eAgVWmSNrnL2Z1wFY+BK+IawMQg2Uxi +neJnCmSz64y5W94PNc5Sye+w7DeFRq67hMX38YpaMMmzU510IOkPDn31YspkIOja93IgE fnWvOHWmKOjFWoRY6qr5KZD18tjnJDx6Wt89EMBbjvtJEPv1WmjWRxmGgK555A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711528544; a=rsa-sha256; cv=none; b=p7EAbpYgv6eFMwWDBn1X4S4lyvSfBq4bDXuPlmlEmRYrJAYfnE1/GGrKMsE4IEmAwaTWui kR6pHl1mbf+f/ZzBUTM1zNYxujs7rSudFocZeeuKeM1Jk+MSLEthT+yOXk2vWvnU+io//G QWpig+8wDnwNFLZ74i1NZWXeZlt3juUKZHek29W85ERLBQsa5apgcwpBZm6zOQ6ANyrX/H cFb50P9KBQ8FNeBHe/FpXVDsJvDWSCmLkZO+OjNaFGF+SHx4UgPksT+gCncsmKkaoMYExh F5JXAlCpcVMpVWyz8PQ8VyGQLAlIpZcWc5EuyxWv3ik2l2BXvrrS3xbwNSW1tA== 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=1711528544; 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=wR1m8FSQWVs6doBAGvwbpqfGRECYGPCtcJrD1oe3WAg=; b=K+AU4zTiqw1MolS6CHt2JJODPJfu/e51dBbK9HsMOX3pkL+dKanbNZT2hkVDdo9lf1iuPY VQJpxVwV5fzBxOJ/aYnEDWwE++w6UDT1klzJUvVhUB4Ugdz0LgP1u1Ee4oAEqYdjAQX206 j2o0Zf9BiAl2hS/UA/3B7l53CiVuGA34OE10Xez//Hc+PlkL8cpSpxRLxT9bDqQu1GSo40 1reV+6c46/5i/7j3qjDhx+j0eoFjtNpJw7kHvYP1CCW8zwHPTQi1FPjxvpoXzQtSIsPbkK q+NuYUopFP0g6MCIYMwoyVljCtjdl+dsZHpX5mjWwhsNj/fS81pnaKR95UfbPA== 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 4V4KkS47gCzccQ; Wed, 27 Mar 2024 08:35:44 +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 42R8Zigo015069; Wed, 27 Mar 2024 08:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R8Zi9e015066; Wed, 27 Mar 2024 08:35:44 GMT (envelope-from git) Date: Wed, 27 Mar 2024 08:35:44 GMT Message-Id: <202403270835.42R8Zi9e015066@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: 0e3acd57984a - stable/14 - pkgbase: add a mechanism to be able to force a give ucl include 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e3acd57984ab13270612cf5ea17227ec45f55e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0e3acd57984ab13270612cf5ea17227ec45f55e7 commit 0e3acd57984ab13270612cf5ea17227ec45f55e7 Author: Baptiste Daroussin AuthorDate: 2024-03-20 08:35:47 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-27 08:34:50 +0000 pkgbase: add a mechanism to be able to force a give ucl include This is made in order to be able to find add the post-install scripts for the kernel, where PKGNAME varies for each KERNCONF but we don't want to dynamically duplicated the kernel.ucl file. At the same time we don't want the *-dbg* packages to actually include those post-install scripts (cherry picked from commit 45d83c39262d9e2727c6f409e19c653f19a5d7cc) --- Makefile.inc1 | 2 ++ release/packages/template.ucl | 1 + 2 files changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index d304dc47010b..58a9b1fd4f3e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2229,6 +2229,8 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "kernel-${_kernel:tl}${flavor}" \ PKGGENNAME "kernel" \ + FORCEINCLUDE "kernel${flavor}" \ + UCLFILES "${SRCDIR}/release/packages/" \ VERSION "${PKG_VERSION}" \ KERNELDIR "kernel.${_kernel}" \ DESC "FreeBSD ${_kernel} kernel ${flavor}" \ diff --git a/release/packages/template.ucl b/release/packages/template.ucl index 2e325e623336..a65f58868118 100644 --- a/release/packages/template.ucl +++ b/release/packages/template.ucl @@ -16,3 +16,4 @@ ${DESC} EOD .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGGENNAME}-all.ucl" .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGNAME}.ucl" +.include(try=true,duplicate=rewrite) "${UCLFILES}/${FORCEINCLUDE}.ucl"