From nobody Thu Sep 18 04:41:53 2025 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 4cS2zP3B1Vz67grC; Thu, 18 Sep 2025 04:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS2zP2BLYz3Gms; Thu, 18 Sep 2025 04:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170513; 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=fVUrI9bk2fF8RK099BPveDnhHSkCYM+tYlCkQhau+pg=; b=cwTziDHa94pMuM9Rb3xznbC6j3gvmNZhxcx8EDW6/0OyrjSZKILEh0knPhJslwj1oXiFKV XJX/Ur5bQ5LChn/7HbH47akpb1yUN9J44rHVv7mzHKuOKqaVwkO51chcI0PcrTlHf9nOge 7WyLx89/6FV5zbazON/BuU6ruuMDUYjuDZuDDvCuXfl/G4yZmmfrcZHxQYGX1xsZ2kMb/q xRubMJAZ8dQUmO0LDJhoxE4UX0fIZPViPui2eOZJJNtY129zWedIECwmsvjS9i0jkzEdwZ pSqERJcLlwoNr5ZsROFZ3Syhl4OSkhZXGCC97m98VVr1w1zG8rBErslKK3WdMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170513; 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=fVUrI9bk2fF8RK099BPveDnhHSkCYM+tYlCkQhau+pg=; b=Yq2KzKCI2lgfZrCa5/vrlOaHoHXme/5MLJaW68fPu1yGgFxcDUEWudfdZggT8iJ35unlc0 8zET0HshgCf0MEomHaTkimgGxoCweE/q+/xKzsuKhlqlpU/+QVwMKCL39lG6yEMEAmQu8r iBUr9vpcKutE0GpL9rhOnRc1r8XhGF7hLHQTjOen5XxT6dkEESwmw3POt5/n6KrjnynjrX LngSz6ug9KeFPqeU7oX0n7HGf0NDav0YSFL3u3LsildvLjBz44pxsyryx5bbPZ+m0iliZj AX4oZj944rnn04fzdybROufm7p65dRUd1AITpw84fZGzBpHaVJZL/z6URVWzNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758170513; a=rsa-sha256; cv=none; b=sJbrW5mPCY6fxlwbphrqZUWp2owNbymCUYZpUvoo14tUpT3tOuSMzVwbdmnbqe8hAyGWCU 18Z1dL2SOkxAnixkCThj1iH64oPc8ZdlbcV1ytmeZt5gUnPvwEFxejOYdQ6jOLcaI6AU0l WgPJYFDrnXvloMBhKJfs1b6yHuoQKhyinfVHJPepnXbr3EuZRwTaroLx0vK9yP2jJBfQru YZuaYpNMT05XnXP3wSN29XhkitjHjg7YUxeyzYw+J6BrRis8x6nf+o+0qahW4vKzis9AWS cf7IFGwt8LTK6WKVYRGHvMCu8avx5LfUI71S5xBsAVtF3NYNlQtqBUhu77g44Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS2zP1Z8DzwM6; Thu, 18 Sep 2025 04:41:53 +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 58I4frax045498; Thu, 18 Sep 2025 04:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I4frIh045484; Thu, 18 Sep 2025 04:41:53 GMT (envelope-from git) Date: Thu, 18 Sep 2025 04:41:53 GMT Message-Id: <202509180441.58I4frIh045484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b9afd7f6a5b1 - main - release: Allow powerpc GENERIC64(le)? kernels 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9afd7f6a5b1cf1a6cbcef7a55aede7e71a0babc Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b9afd7f6a5b1cf1a6cbcef7a55aede7e71a0babc commit b9afd7f6a5b1cf1a6cbcef7a55aede7e71a0babc Author: Colin Percival AuthorDate: 2025-09-15 02:44:07 +0000 Commit: Colin Percival CommitDate: 2025-09-18 04:40:43 +0000 release: Allow powerpc GENERIC64(le)? kernels The pkgbase-stage.lua script asserts that it has exactly one "kernel", but only accepts GENERIC as a "kernel". Use a slightly more permissive regex in order to capture kernels with names which start "GENERIC". Reviwed by: ivy MFC after: 12 hours Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52544 --- release/scripts/pkgbase-stage.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index a12ec372d1a9..0cd4cbb5c438 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -50,10 +50,12 @@ local function select_packages(pkg, media, all_libcompats) package ~= "FreeBSD-kernel-man" then -- Kernels other than FreeBSD-kernel-generic are ignored - if package == "FreeBSD-kernel-generic" then - table.insert(components["kernel"], package) - elseif package == "FreeBSD-kernel-generic-dbg" then + -- Note that on powerpc64 and powerpc64le the names are + -- slightly different. + if package:match("^FreeBSD%-kernel%-generic.*%-dbg") then table.insert(components["kernel_dbg"], package) + elseif package:match("^FreeBSD%-kernel%-generic.*") then + table.insert(components["kernel"], package) end elseif package:match(".*%-dbg$") then table.insert(components["base_dbg"], package)