From nobody Wed Mar 20 08:53:49 2024 X-Original-To: dev-commits-src-main@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 4V02SY2mgzz5FVCv; Wed, 20 Mar 2024 08:53:49 +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 4V02SY23ytz4LsW; Wed, 20 Mar 2024 08:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710924829; 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=BwAhCw1SEhwpkRhz8vr0x4MVAOp6+rzVZKyZNMKoBYk=; b=nZcbYEnrmToaDrIxNMjl3PtCKcb7ic8x6vJROmJK4vAvlGJZuM5P1+uSIFdln1lBCRPP3V 0sFs4xdeFQlJV//x+/VxumkwOO+GTvENtHkuf1i2XqAHmRQflCQDdLJl5JRnzGDJVyJMWC EGo0fjHIru998vFaQBAfJcztrQmMuoobvc4yy8LlgfIMaxpuVBmOmsNOCZm8yT1aTob7qK xTT+HbDnE4uYCeMQLcFO66CkzxhCNdSUd8RQR3E7SunD9z7+pPoIBEDUElxuukqSGThT6b 9LbtETiy5b17WnvxjH3BNgC6dhHR4LRKzT302pvg3wBLaQHb21bhjCz/pD5isQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710924829; a=rsa-sha256; cv=none; b=sLyGKtBQhQIcdtTkQUvtsHPd0+jiD/ExFDmasT+glvRoPOv4Gr/Ninf0zIcairM2PLTW9x MOpfhKJmcrpNu+36JHvQL+XP8LhfhS/ej4eQ+kjifsDQUbX8c97aPhqydmBuhGIsyRTRev yx3QABhkZagzLEXnpeMCt+hVk3N1l/ew9L1laCpE4iOubRLk+SR9OYVlTw/wnJqe9L0SNT YSBVhwCt56cUR/J6TF2unb7Z/bsLLqGgvXrCovDbBWgmqUz8KY5IQSHCEu9kPYokyjj2tG ky0CQaSHR4SoysyLSC9Zk/rKO5hWGwnZt4jnlBTlMuKr/VTkpdyox06hMZr4fw== 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=1710924829; 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=BwAhCw1SEhwpkRhz8vr0x4MVAOp6+rzVZKyZNMKoBYk=; b=dVyYa8ygVYZrQX1ot4TYLL9pbCblErW10zpf5jWNhYt1FPafyJawXSFeM4/aKN6M0qS4L9 laRKHWy1zicsZODWuLWlVHktrxvo31J1+32LPpIztWsVGxCeteUufoXpHRTfTG+jwu3a+J 8HXn00neIXecB56N6KJmLqrZkVaR2axU4kgCUe5J4Q2jIO2bQxY3wgX6BeuvtsJVn++s4P LVbQEgYe0VaDFixtwsW48luTtrgpVrD6ozyuFnCE/UPCGcBtmSRL8O6a+U+XqU+n4AS3Lp QF8kZomfqiUMK4LrnGLrXGzTfKRR6XskU2DgJbvZDQyymN8kRp8PEKtE3O8/ow== 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 4V02SY1WVpzl6r; Wed, 20 Mar 2024 08:53:49 +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 42K8rndq059941; Wed, 20 Mar 2024 08:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K8rn7e059938; Wed, 20 Mar 2024 08:53:49 GMT (envelope-from git) Date: Wed, 20 Mar 2024 08:53:49 GMT Message-Id: <202403200853.42K8rn7e059938@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: 45d83c39262d - main - pkgbase: add a mechanism to be able to force a give ucl include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 45d83c39262d9e2727c6f409e19c653f19a5d7cc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=45d83c39262d9e2727c6f409e19c653f19a5d7cc commit 45d83c39262d9e2727c6f409e19c653f19a5d7cc Author: Baptiste Daroussin AuthorDate: 2024-03-20 08:35:47 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 08:39:18 +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 --- Makefile.inc1 | 2 ++ release/packages/template.ucl | 1 + 2 files changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0c9213ea5104..2ed76aa68c65 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2258,6 +2258,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"