sys-kernel/xanmod-{kernel, sources}: bump to 6.7.10

This commit is contained in:
Yachen Wang 2024-03-27 18:19:40 +08:00 committed by 梁永祥
parent c0c54bd0c9
commit 7e214e7e14
8 changed files with 7 additions and 221 deletions

View File

@ -1,9 +1,6 @@
DIST cjktty-6.7.patch 12419544 BLAKE2B 9a04dd9d63207f2233423434eac319dec9ee7141909b5a094ffea83729237b7042684689c302d1efc762f822e9d2d68995193554c419bbfa2bb98bd52fb9a6e6 SHA512 4ad67e5cf04c3ffe2444e86d3c5d2a1548b1610053103422d7cb9e69846a79ad143f93d758459a4f2747fa240d4e8600a994a5f8c51f72d962cf4f2d804563b0
DIST cjktty-add-cjk32x32-font-data.patch 44665996 BLAKE2B 101996793aeede5e456b23b35c2fd4af5c38fd363473dcdda0bce6e21d110a9f88a67e325b1ebf8efef4a7511f135c4f64ff1fc54b8ef925a5df8d6292ba7678 SHA512 c4a443b901030097623d191731a56c87cff2ba3422385d6d7b624387ffa4f659abde07c8360f07e099cd678f8c9b542d7199e3a05febc4c7deaba9e950012cb5
DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b
DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f
DIST genpatches-6.7-11.extras.tar.xz 3704 BLAKE2B 1afd454ba83299605a573405732f41eda7a261f8cf524bfdaf329b4130849b0ff0895d39902360e3e4351fbf5ff1aeb2e378372d556bdf3c90b330a2195a7c89 SHA512 9d5b52bc1853f5cc41bc762ec023037ec25f22e13f1b098f7e7493b29645cdfbea14ebbac291330ae61a7c1a9b5f8291b7b2f88f61690cfe00a129693b98d035
DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6 SHA512 eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622
DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
DIST patch-6.7.6-xanmod1.xz 709612 BLAKE2B e268e22b2063a4dd0505ef14358399c3a3c95153b792dd87c5c7c6c159256b5787abf0d369d71373db00efb51e0e649992c98be6d3b66ce0c34909518a058051 SHA512 dba397e7d39bc11bf0cfc61339743c7273dddcc5ce0a6fbe2fa36a94de0aba1d0ef53759e93ccf9c44fa6b3b533aa12cfb5cd12985a45b6da18eae1b07d9dfbf
DIST patch-6.7.7-xanmod1.xz 811740 BLAKE2B 487879dc7b304001af46e8ef184f2ea18e3a02e4c831083641383e69888e2c46637763694d007af556b6ae5a7deea7725f62a18a8b1d278b6c95b1a5b45000a7 SHA512 f22afc1b60c017e1bfe807f5436a8588f141a52d2f03ef2edbd9b5a687337dde6e30661671aad879fe8e1fb6858c907605661d5a4d2442517046a369ce72544c
DIST patch-6.7.10-xanmod1.xz 866656 BLAKE2B e5d1a63145768c011d9f98fc360d9781646d05c19d18b2acbda1e9074d394288a9f7af09f17c058bd0e0d2561c89032be2b131e32c55bbd2843263604a1e847a SHA512 4dbd361d0f1e77df9e926187cfab9e6fb3fc0fbfd95a052416734a4091931e903029c20647d94ea9d0e0ec8bc4f01fec33f9f2b18ecd92595c89bb516f62f319

View File

@ -1,111 +0,0 @@
# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit kernel-build python-any-r1 toolchain-funcs
PYTHON_COMPAT=( python3_{9..11} )
MY_P=linux-${PV%.*}
#Note: to bump xanmod, check GENPATCHES_P in sys-kernel/gentoo-kernel
GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.} + 4))
XV="1"
DESCRIPTION="XanMod lts kernel built with Gentoo patches and cjktty"
HOMEPAGE="https://www.kernel.org/"
SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
mirror://sourceforge/xanmod/patch-${PV}-xanmod1.xz
https://raw.githubusercontent.com/zhmars/cjktty-patches/master/v6.x/cjktty-${PV%.*}.patch
https://raw.githubusercontent.com/zhmars/cjktty-patches/master/cjktty-add-cjk32x32-font-data.patch"
S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
KEYWORDS="~amd64"
IUSE="cjk clang debug +x86-64-v1 x86-64-v2 x86-64-v3 x86-64-v4"
REQUIRED_USE="^^ ( x86-64-v1 x86-64-v2 x86-64-v3 x86-64-v4 )"
PDEPEND="
>=virtual/dist-kernel-${PV}"
QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
pkg_setup() {
ewarn ""
ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
ewarn "You have to configure the kernel by yourself."
ewarn "Generally emerge this package using default config will fail to boot."
ewarn "If you need support, please contact the ${HOMEPAGE} or maintainer directly."
ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
ewarn "the ebuilds. Thank you."
ewarn ""
python-any-r1_pkg_setup "$@"
if use clang && ! tc-is-clang; then
export LLVM_IAS=1
export LLVM=1
export CC=clang
export LD=ld.lld
export AR=llvm-ar
export NM=llvm-nm
export OBJCOPY=llvm-objcopy
export OBJDUMP=llvm-objdump
export READELF=llvm-readelf
export STRIP=llvm-strip
else
tc-export CXX CC
fi
}
src_prepare() {
# delete linux version patches
rm "${WORKDIR}"/*${MY_P}*.patch
local PATCHES=(
# genpatches
"${WORKDIR}"/*.patch
# xanmod patches
"${WORKDIR}"/patch-${PV}-xanmod${XV}
)
if use cjk; then
PATCHES+=("${DISTDIR}/cjktty-${PV%.*}.patch")
PATCHES+=("${DISTDIR}/cjktty-add-cjk32x32-font-data.patch")
fi
default
# prepare the default config
case ${ARCH} in
amd64)
if use x86-64-v1; then
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
XV="${XV}-x64v1"
elif use x86-64-v2; then
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v2" .config || die
XV="${XV}-x64v2"
elif use x86-64-v3; then
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v3" .config || die
XV="${XV}-x64v3"
elif use x86-64-v4; then
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v4" .config || die
XV="${XV}-x64v4"
fi
;;
*)
die "Unsupported arch ${ARCH}"
;;
esac
local myversion="-xanmod${XV}"
echo "CONFIG_LOCALVERSION=\"${myversion}\"" >"${T}"/version.config || die
echo "CONFIG_MODPROBE_PATH=\"/sbin/modprobe\"" >"${T}"/modprobe.config || die
local merge_configs=(
"${T}"/version.config
"${T}"/modprobe.config
)
kernel-build_merge_configs "${merge_configs[@]}"
# delete localversion
rm "${S}/localversion" || die
}

View File

@ -1,9 +1,6 @@
DIST cjktty-6.7.patch 12419544 BLAKE2B 9a04dd9d63207f2233423434eac319dec9ee7141909b5a094ffea83729237b7042684689c302d1efc762f822e9d2d68995193554c419bbfa2bb98bd52fb9a6e6 SHA512 4ad67e5cf04c3ffe2444e86d3c5d2a1548b1610053103422d7cb9e69846a79ad143f93d758459a4f2747fa240d4e8600a994a5f8c51f72d962cf4f2d804563b0
DIST cjktty-add-cjk32x32-font-data.patch 44665996 BLAKE2B 101996793aeede5e456b23b35c2fd4af5c38fd363473dcdda0bce6e21d110a9f88a67e325b1ebf8efef4a7511f135c4f64ff1fc54b8ef925a5df8d6292ba7678 SHA512 c4a443b901030097623d191731a56c87cff2ba3422385d6d7b624387ffa4f659abde07c8360f07e099cd678f8c9b542d7199e3a05febc4c7deaba9e950012cb5
DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b
DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f
DIST genpatches-6.7-11.extras.tar.xz 3704 BLAKE2B 1afd454ba83299605a573405732f41eda7a261f8cf524bfdaf329b4130849b0ff0895d39902360e3e4351fbf5ff1aeb2e378372d556bdf3c90b330a2195a7c89 SHA512 9d5b52bc1853f5cc41bc762ec023037ec25f22e13f1b098f7e7493b29645cdfbea14ebbac291330ae61a7c1a9b5f8291b7b2f88f61690cfe00a129693b98d035
DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6 SHA512 eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622
DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
DIST patch-6.7.6-xanmod1.xz 709612 BLAKE2B e268e22b2063a4dd0505ef14358399c3a3c95153b792dd87c5c7c6c159256b5787abf0d369d71373db00efb51e0e649992c98be6d3b66ce0c34909518a058051 SHA512 dba397e7d39bc11bf0cfc61339743c7273dddcc5ce0a6fbe2fa36a94de0aba1d0ef53759e93ccf9c44fa6b3b533aa12cfb5cd12985a45b6da18eae1b07d9dfbf
DIST patch-6.7.7-xanmod1.xz 811740 BLAKE2B 487879dc7b304001af46e8ef184f2ea18e3a02e4c831083641383e69888e2c46637763694d007af556b6ae5a7deea7725f62a18a8b1d278b6c95b1a5b45000a7 SHA512 f22afc1b60c017e1bfe807f5436a8588f141a52d2f03ef2edbd9b5a687337dde6e30661671aad879fe8e1fb6858c907605661d5a4d2442517046a369ce72544c
DIST patch-6.7.10-xanmod1.xz 866656 BLAKE2B e5d1a63145768c011d9f98fc360d9781646d05c19d18b2acbda1e9074d394288a9f7af09f17c058bd0e0d2561c89032be2b131e32c55bbd2843263604a1e847a SHA512 4dbd361d0f1e77df9e926187cfab9e6fb3fc0fbfd95a052416734a4091931e903029c20647d94ea9d0e0ec8bc4f01fec33f9f2b18ecd92595c89bb516f62f319

View File

@ -4,7 +4,7 @@
EAPI="8"
K_WANT_GENPATCHES="base extras"
#Note: to bump xanmod, check K_GENPATCHES_VER in sys-kernel/gentoo-sources
K_GENPATCHES_VER="10"
K_GENPATCHES_VER="14"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
ETYPE="sources"

View File

@ -1,80 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
K_WANT_GENPATCHES="base extras"
#Note: to bump xanmod, check K_GENPATCHES_VER in sys-kernel/gentoo-sources
K_GENPATCHES_VER="11"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
ETYPE="sources"
inherit kernel-2
detect_version
DESCRIPTION="Full XanMod source, including the Gentoo patchset and other patch options."
HOMEPAGE="https://xanmod.org
https://github.com/zhmars/cjktty-patches
https://github.com/hamadmarri/TT-CPU-Scheduler"
LICENSE+=" CDDL"
KEYWORDS="~amd64"
#
# Freeze the 'tt' use flag until the corresponding patch is released upstream.
#
#IUSE="cjktty tt"
IUSE="cjktty"
XANMOD_VERSION="1"
XANMOD_URI="mirror://sourceforge/xanmod"
OKV="${OKV}-xanmod"
TT_URI="https://raw.githubusercontent.com/hamadmarri/TT-CPU-Scheduler/master/patches/"
CJKTTY_URI="https://raw.githubusercontent.com/zhmars/cjktty-patches/master/"
SRC_URI="
${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz
${GENPATCHES_URI}
${XANMOD_URI}/patch-${OKV}${XANMOD_VERSION}.xz
${CJKTTY_URI}/v${KV_MAJOR}.x/cjktty-${KV_MAJOR}.${KV_MINOR}.patch
${CJKTTY_URI}/cjktty-add-cjk32x32-font-data.patch
"
#${TT_URI}/${KV_MAJOR}.${KV_MINOR}/tt-${KV_MAJOR}.${KV_MINOR}.patch
#${CJKTTY_URI}/cjktty-${KV_MAJOR}.${KV_MINOR}.patch
#"
src_unpack() {
universal_unpack
mkdir "${WORKDIR}/genpatches" || die
for i in ${K_WANT_GENPATCHES}; do
tar xf "${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz" \
-C "${WORKDIR}/genpatches" || die
done
rm "${WORKDIR}"/genpatches/*linux-"${KV_MAJOR}"."${KV_MINOR}"*.patch
UNIPATCH_LIST=""
for i in $(dir "${WORKDIR}"/genpatches/*.patch); do
UNIPATCH_LIST+=" ${i}"
done
if use cjktty; then
UNIPATCH_LIST+=" ${DISTDIR}/cjktty-${KV_MAJOR}.${KV_MINOR}.patch"
UNIPATCH_LIST+=" ${DISTDIR}/cjktty-add-cjk32x32-font-data.patch"
fi
UNIPATCH_LIST+=" ${DISTDIR}/patch-${OKV}${XANMOD_VERSION}.xz"
unipatch "${UNIPATCH_LIST}"
unpack_fix_install_path
env_setup_xmakeopts
cd "${S}" || die
}
pkg_postinst() {
elog "MICROCODES"
elog "Use xanmod-sources with microcodes"
elog "Read https://wiki.gentoo.org/wiki/Intel_microcode"
kernel-2_pkg_postinst
}
#pkg_postrm() {
# kernel-2_pkg_postrm
#}

View File

@ -1,17 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Virtual to depend on any Distribution Kernel"
SLOT="0/${PV}"
KEYWORDS="~amd64"
RDEPEND="
|| (
~sys-kernel/gentoo-kernel-${PV}
~sys-kernel/gentoo-kernel-bin-${PV}
~sys-kernel/vanilla-kernel-${PV}
~sys-kernel/xanmod-kernel-${PV}
)"