diff --git a/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild b/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild index 5e7a2dde..eeb8d436 100644 --- a/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild +++ b/sys-kernel/asahi-kernel/asahi-kernel-6.6.0_p16-r2.ebuild @@ -73,8 +73,13 @@ src_prepare() { # prepare the default config cp "${DISTDIR}/kernel-aarch64-16k-fedora.config-${CONFIG_VER}" ".config" || die - # localversion.05-asahi already appends "-asahi" - local myversion="-${MY_TAG}-dist" + # ensure a consistant version across kernel and gentoo + # this passes the ${PV}-as-release check in kernel-install_pkg_preinst() + # override "-asahi" in localversion.05-asahi with "_pX" to override the + # kernel's base varsion to gentoo's ${PV} + echo "-p${MY_TAG}" > localversion.05-asahi + # use CONFIG_LOCALVERSION to provide "asahi" and "dist" annotations. + local myversion="-asahi-dist" echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" @@ -114,11 +119,6 @@ src_install() { done } -# Override kernel-install_pkg_preinst() to avoid ${PV}-as-release check -pkg_preinst() { - true -} - pkg_postinst() { einfo "For more information about Asahi Linux please visit ${HOMEPAGE}," einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki."