From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C04B15802E for ; Thu, 27 Jun 2024 07:33:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42281E2B4D; Thu, 27 Jun 2024 07:33:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20B2EE2B4D for ; Thu, 27 Jun 2024 07:33:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CFE7342FB3 for ; Thu, 27 Jun 2024 07:33:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 460241D6B for ; Thu, 27 Jun 2024 07:33:45 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1719473523.e59872603f7c7e448fc93622d161db87f83877ed.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: e59872603f7c7e448fc93622d161db87f83877ed X-VCS-Branch: master Date: Thu, 27 Jun 2024 07:33:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf28e22f-f554-4ef7-ad87-09d3a2b2f96d X-Archives-Hash: 0e16f0533dc2fb151685dd615c917b2e commit: e59872603f7c7e448fc93622d161db87f83877ed Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Jun 25 15:25:39 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Jun 27 07:32:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5987260 sys-kernel/gentoo-kernel-bin: overwrite dist-kernel identifier from gpkg Signed-off-by: Andrew Ammerlaan gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/37281 Signed-off-by: Andrew Ammerlaan gentoo.org> sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild | 5 +++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild | 3 +++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild | 3 +++ 16 files changed, 66 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild index 056b437be6d3..afe78d41b131 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.218.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild index 1a44f330be18..53f05cd94273 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.219.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild index 1a44f330be18..53f05cd94273 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.220.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild index ef204824142d..361acce28475 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.160.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild index eff249432fc9..81911930d7d6 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.161.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild index e436cfb11400..811b77ad4230 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.92.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild index 1a845828a60b..e9784eccdc80 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.93.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild index 1a845828a60b..e9784eccdc80 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.94.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild index 1a845828a60b..e9784eccdc80 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.95.ebuild @@ -108,6 +108,11 @@ src_test() { } src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild index 722f529cedf9..7a145efe0347 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild index ecc98612a7de..e0e46cd48882 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.33.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild index ecc98612a7de..e0e46cd48882 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.34.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild index ecc98612a7de..e0e46cd48882 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.35.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild index 5af44cece78d..1503fa4fb5d1 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.4.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild index 5af44cece78d..1503fa4fb5d1 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild index 5af44cece78d..1503fa4fb5d1 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild @@ -134,6 +134,9 @@ src_install() { fi fi + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot