From nobody Mon Dec 16 09:47:05 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 4YBZpx73V1z5hCNb; Mon, 16 Dec 2024 09:47:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBZpx5nhwz4nfH; Mon, 16 Dec 2024 09:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734342425; 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=u69ZuXnwhA0/8SuiHa8TyIRAhrWKXoH/TNa0bJDqgrQ=; b=OUtpnk9FyHW21dtlw7ENpnY/wU+FzjLYu1UES7LiohX5g9pnye/x2wJD4uMVVf5sBluLSF 64MQQewy0lV5UwqTHrvsk3CgTaIw1B1LrMoOFhb5krp92njSAnaNrl46g+/zpfSEDzqyAz UfBcSZmWTVsZS9tx9Q3KXq2mjfyctSoJw08wCw5J9j0AcXr/WOY5sQxhEmVIHwBcZD6Une c8lZ4jW3rxhVxM+sHVswkht8OyyCj2cp/0cvrgQfU51iT5vuj4Gp7HQ/tzFuAPKxHkXbm6 nVwfIxpui/N7fjDql79lV8evFH7f/F0YkE12PVIYhkFDPPNKmE2rqBpUOt0FNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734342425; 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=u69ZuXnwhA0/8SuiHa8TyIRAhrWKXoH/TNa0bJDqgrQ=; b=AtGFX5yg17mMiO3CZ7CuMdHXGhKW2+DnvAj6fHxFj6wvVfQ7r6JFoIqT7OX9HwHpzwn+aK sJVbT2x/2Feajy03jB5M76fmg36s2YjgTs+R2kzxiWCtkOMpDBaZ1+PPUlDPXJOzjFL5M3 cZ1+yOkprv9skwWIafekFIDhQ3DIdczC/vA9utfwbBs5eNLqyHB6cveley11Sdt6ALJLAs aFQ4fARvPUQobGob+ITwcOUmOMI5szFEGPhcFLGqyU+YFjVGa9u+J6irufHaFdZfDs69TV 8UUV2QVB7L1tRuqhtOhKqzKw4S/KxKt6Y296qfgOiWLNQ+rGV8q5Wj0zdIqGQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734342425; a=rsa-sha256; cv=none; b=u6pzxuJ+jTS9KAsF5194FmfWp4nZiokAdW5QQmfC8EOFdm24mC0Gw+w6gyr+BAYNz2vE30 FmHzPKkf6cKibznqgq0VRsYsphGrn6mjU2uTXpBTM+I9VF2D4xuZUaT7iePUwUPB4XIdz2 mI0k+5JzlVYou1upABw/okHckwCsTQP8aftUIyPwsNd1HK1sF0cek432G/Ij057TWKROeY hpzYX1mn84BFWsf/pkLd5IFuGx6pKyPelHTZtB8BwkaM61oLpoOz01J6y8uLgVnTv+Q8xf 3D/Zal5bKp7101PTwnAaBtxFOmpoOuQRpNr7CbVmtk1FKJLHU5Tcy5Qel9v0TQ== 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 4YBZpx5G6Dznlk; Mon, 16 Dec 2024 09:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BG9l5TZ092357; Mon, 16 Dec 2024 09:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BG9l5t3092354; Mon, 16 Dec 2024 09:47:05 GMT (envelope-from git) Date: Mon, 16 Dec 2024 09:47:05 GMT Message-Id: <202412160947.4BG9l5t3092354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 11f3da565519 - main - pkgbase: Remove /boot/firmware from bootloader package 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11f3da5655194c46b4acdde586ac1b8d6a196994 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=11f3da5655194c46b4acdde586ac1b8d6a196994 commit 11f3da5655194c46b4acdde586ac1b8d6a196994 Author: Emmanuel Vadot AuthorDate: 2024-12-12 16:12:11 +0000 Commit: Emmanuel Vadot CommitDate: 2024-12-16 09:44:45 +0000 pkgbase: Remove /boot/firmware from bootloader package For now we don't ship anything in /boot/firmware, but some up coming commit will ship wifi drivers in it and we want them to be in their own package. Sponsored by: Beckhoff Automation GmbH & Co. KG --- release/scripts/mtree-to-plist.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk index a5ff6fef235a..a9f1e194389a 100644 --- a/release/scripts/mtree-to-plist.awk +++ b/release/scripts/mtree-to-plist.awk @@ -43,7 +43,7 @@ if ($1 ~ /^\/boot\//) { if (kernel != "" && $1 ~ /^\/boot\/dtb\//) pkgname="dtb" - else + else if ($1 !~ /^\/boot\/firmware\//) pkgname="bootloader" } gsub(/package=/, "", pkgname)