commit: e59872603f7c7e448fc93622d161db87f83877ed Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Tue Jun 25 15:25:39 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <andrewammerlaan <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/37281 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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
