Skip to content

Commit

Permalink
sys-kernel/xanmod-{kernel, sources}: bump to 6.6.1, close #2962 close #…
Browse files Browse the repository at this point in the history 
…3861
  • Loading branch information
@OriPoin @liangyongxiang
OriPoin authored and liangyongxiang committed Nov 11, 2023
1 parent c944091 commit 133888c
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 17 deletions.
11 changes: 6 additions & 5 deletions sys-kernel/xanmod-kernel/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DIST cjktty-6.4.patch 12419549 BLAKE2B 137f469cf6931c2ea64393b808cf7d31497ef361170f624b105fc8920168354fa7ac27dcf5eaa929832ed7fd4a391c65561c7736619c740edb267f4fad50bc58 SHA512 669cad0dc2a19feebdee23041253c3edbdc06dd1b8e952382c1116edafe10a3783459bfda3e96b6b4f7e2afa74d9099791f041beb31d4f7075bdd9b85c419cf8
DIST genpatches-6.4-17.base.tar.xz 818408 BLAKE2B 71e3e8271b5ba2788bb52f42e8cf7846375856d0a946188c01e1e20f4bd2001817837910d9272c5e70cffd539d7f9e30dc89d7378501f18ebff678d699824e3b SHA512 bd11bee4f21132321da063dfd66f506e67e5528fa6aafddfb483067a0ca02e92ef71a83c02bbe601e434d5c77649f17c7e9d9e34ba1c9f06084eda79906b73a3
DIST genpatches-6.4-17.extras.tar.xz 3696 BLAKE2B 6a9be135efa7a8fdc0ebafd41ed2f8794530e6052d3a955d6142c03d7f134d2157efbdaef071c0b0f362406e42a404f385bb4c73717b24e427a4a6e886ea1504 SHA512 191a861faefd72ce25d4a6bf873488e5b8625b70f46bd1bf1f36125483ecffcd00cb5c3a7a07e2cd5d97d5f140d8ddb9897e80fa010492e64435340eab9c76bd
DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
DIST patch-6.4.15-xanmod1.xz 934176 BLAKE2B ddf924e34e8f5ff02346164e59914c65f9bc40282e70edb8a91c0a20b7ad8f7eaa5a157b5f2db030c34208cd7ff8d1fdde05d55ce01b6f69e22aac19f618fea0 SHA512 e03ba09ad5cac975700992ff7abbed07da7ac29c04ba5d1b1c37b0c648e0ab96ddb176890a021f6aac89be69be70ef69c66d8ca05016dea28268ca569e5a5812
DIST cjktty-6.6.patch 12419544 BLAKE2B e3769b00511c088997ea12c9e86108db8357c2589df625ce03b439853e3ed2631151a2755858edf715e35928d7e95bf9ad4f9f717b01f14014358bc716fab541 SHA512 e2e6cb71ce64c183213757139c1c5176b244efb6a049f2be5393a11339e26e7aa5a3a69eab385da3e2c4252233a622752cfcc3e4661fc267a44b1e00f5690b9b
DIST cjktty-add-cjk32x32-font-data.patch 44665996 BLAKE2B 101996793aeede5e456b23b35c2fd4af5c38fd363473dcdda0bce6e21d110a9f88a67e325b1ebf8efef4a7511f135c4f64ff1fc54b8ef925a5df8d6292ba7678 SHA512 c4a443b901030097623d191731a56c87cff2ba3422385d6d7b624387ffa4f659abde07c8360f07e099cd678f8c9b542d7199e3a05febc4c7deaba9e950012cb5
DIST genpatches-6.6-2.base.tar.xz 14616 BLAKE2B 3da38df6de90845f4ffdd61708573589973649c5d38082199994488d2679cfc70f954acdd1760a1b4a9162944f0bffc0443590956898b6d1fb79a363958c2859 SHA512 5abd3bf1d05e0e4331ebd2046d6f1e4f1091e25bc4d5624b78f6cc702dd14f6e11f6441bf12694500e96803909384420cf3b82148ae80c23a7f1c66b5bd2bb84
DIST genpatches-6.6-2.extras.tar.xz 3704 BLAKE2B d236133d98bb12a2310894614452c4d293b082a8f42a26c502e26022432515e71791dbdba1ca25e62e5d4904b441bc86ab123915ace1606d1e28571e83f0e9a5 SHA512 3bc907ecd0bab38c21ba8703fd0b44a0f23c9ac3de36029764813d121f0e4f3da8299671ebc021bf501c7e6cd63b848bb80a14fcb601f02cf850a8bf3bb0d826
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST patch-6.6.1-xanmod1.xz 149152 BLAKE2B c293a18e462800782349b54bcb7176549dff4c452b508385bb1d006840ca6253d1b49cd7c3d3a3168e059ade36817530cc68552e7a0d9962e503d03eedf343ea SHA512 20d2f16955f5a70fedf006c459590302e0787691d46144b82b32219b318ab77dabfbd735dc31b60923356c919718d986936233f398b9a363d04a9349c91f3312
1 change: 1 addition & 0 deletions sys-kernel/xanmod-kernel/metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
</use>
<upstream>
<remote-id type="sourceforge">xanmod</remote-id>
<remote-id type="github">zhmars/cjktty-patches</remote-id>
</upstream>
</pkgmetadata>
8 changes: 5 additions & 3 deletions ...xanmod-kernel/xanmod-kernel-6.4.15.ebuild → .../xanmod-kernel/xanmod-kernel-6.6.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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##*.} + 2))
GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.} + 1))
XV="1"

DESCRIPTION="XanMod lts kernel built with Gentoo patches and cjktty"
Expand All @@ -17,7 +17,8 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
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/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"
Expand Down Expand Up @@ -59,7 +60,7 @@ pkg_setup() {

src_prepare() {
# delete linux version patches
rm "${WORKDIR}"/*${MY_P}*.patch || die
rm "${WORKDIR}"/*${MY_P}*.patch

local PATCHES=(
# genpatches
Expand All @@ -69,6 +70,7 @@ src_prepare() {
)
if use cjk; then
PATCHES+=("${DISTDIR}/cjktty-${PV%.*}.patch")
PATCHES+=("${DISTDIR}/cjktty-add-cjk32x32-font-data.patch")
fi
default

Expand Down
11 changes: 6 additions & 5 deletions sys-kernel/xanmod-sources/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DIST cjktty-6.4.patch 12419549 BLAKE2B 137f469cf6931c2ea64393b808cf7d31497ef361170f624b105fc8920168354fa7ac27dcf5eaa929832ed7fd4a391c65561c7736619c740edb267f4fad50bc58 SHA512 669cad0dc2a19feebdee23041253c3edbdc06dd1b8e952382c1116edafe10a3783459bfda3e96b6b4f7e2afa74d9099791f041beb31d4f7075bdd9b85c419cf8
DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928
DIST patch-6.4.15-xanmod1.xz 934176 BLAKE2B ddf924e34e8f5ff02346164e59914c65f9bc40282e70edb8a91c0a20b7ad8f7eaa5a157b5f2db030c34208cd7ff8d1fdde05d55ce01b6f69e22aac19f618fea0 SHA512 e03ba09ad5cac975700992ff7abbed07da7ac29c04ba5d1b1c37b0c648e0ab96ddb176890a021f6aac89be69be70ef69c66d8ca05016dea28268ca569e5a5812
DIST cjktty-6.6.patch 12419544 BLAKE2B e3769b00511c088997ea12c9e86108db8357c2589df625ce03b439853e3ed2631151a2755858edf715e35928d7e95bf9ad4f9f717b01f14014358bc716fab541 SHA512 e2e6cb71ce64c183213757139c1c5176b244efb6a049f2be5393a11339e26e7aa5a3a69eab385da3e2c4252233a622752cfcc3e4661fc267a44b1e00f5690b9b
DIST cjktty-add-cjk32x32-font-data.patch 44665996 BLAKE2B 101996793aeede5e456b23b35c2fd4af5c38fd363473dcdda0bce6e21d110a9f88a67e325b1ebf8efef4a7511f135c4f64ff1fc54b8ef925a5df8d6292ba7678 SHA512 c4a443b901030097623d191731a56c87cff2ba3422385d6d7b624387ffa4f659abde07c8360f07e099cd678f8c9b542d7199e3a05febc4c7deaba9e950012cb5
DIST genpatches-6.6-1.base.tar.xz 4044 BLAKE2B 5936817ce6dcf9e395b1f54efbf8890875bd00d6d59a1ab01bd4ce1d8c46756bd2599a149cdfd6fb745b7038c5213f60086aa76fa12c5fa50072efc7e528691f SHA512 fd07f605479ca9439aae0876b4597918bc847c00dc594e80be263917fb0bb1a87a6c8465c15f1f5c7bcc39359b6ee92eb56365878a9017b9a8185eccd4cd30f4
DIST genpatches-6.6-1.extras.tar.xz 3700 BLAKE2B ae850052cea73d318cfde8ea35eb351dd0b4177d3a5f55614541eaa62cadf58723148871cd6cc87d0bdbf35d05b4f9db54432a324f2f0e7bedf6773cb419bc2e SHA512 5dc25b2c4daccbc5b7c275071e460b9c662fbdfc1a82eeff1da00437660f6d0ab8882cb79d48520e60e4c3f0a16a79564f3a0ebbd515b3d42fb6289fc9c8e29a
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST patch-6.6.1-xanmod1.xz 149152 BLAKE2B c293a18e462800782349b54bcb7176549dff4c452b508385bb1d006840ca6253d1b49cd7c3d3a3168e059ade36817530cc68552e7a0d9962e503d03eedf343ea SHA512 20d2f16955f5a70fedf006c459590302e0787691d46144b82b32219b318ab77dabfbd735dc31b60923356c919718d986936233f398b9a363d04a9349c91f3312
1 change: 1 addition & 0 deletions sys-kernel/xanmod-sources/metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<pkgmetadata>
<upstream>
<remote-id type="sourceforge">xanmod</remote-id>
<remote-id type="github">zhmars/cjktty-patches</remote-id>
</upstream>
<maintainer type="person">
<email>[email protected]</email>
Expand Down
10 changes: 6 additions & 4 deletions ...nmod-sources/xanmod-sources-6.4.15.ebuild → ...anmod-sources/xanmod-sources-6.6.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="14"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
ETYPE="sources"
Expand All @@ -28,12 +28,13 @@ 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/v${KV_MAJOR}.x/"
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}/cjktty-${KV_MAJOR}.${KV_MINOR}.patch
${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
Expand All @@ -47,7 +48,7 @@ src_unpack() {
-C "${WORKDIR}/genpatches" || die
done

rm "${WORKDIR}"/genpatches/*linux-"${KV_MAJOR}"."${KV_MINOR}"*.patch || die
rm "${WORKDIR}"/genpatches/*linux-"${KV_MAJOR}"."${KV_MINOR}"*.patch

UNIPATCH_LIST=""
for i in $(dir "${WORKDIR}"/genpatches/*.patch); do
Expand All @@ -56,6 +57,7 @@ src_unpack() {

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"
Expand Down
0 ...ual/dist-kernel/dist-kernel-6.4.15.ebuild → virtual/dist-kernel/dist-kernel-6.6.1.ebuild
View file
File renamed without changes.

0 comments on commit 133888c

Please sign in to comment.