1 |
commit: 93e20764a708c77b800a0e0937576ddf041f2ea6 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 29 20:52:06 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 29 20:58:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e20764 |
7 |
|
8 |
sys-kernel/gentoo-kernel: add big-endian config part for 5.15.5 |
9 |
|
10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/gentoo-kernel/Manifest | 1 + |
13 |
sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild | 12 +++++++++++- |
14 |
2 files changed, 12 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest |
17 |
index b26e7dd75f28..136f53e8a8a3 100644 |
18 |
--- a/sys-kernel/gentoo-kernel/Manifest |
19 |
+++ b/sys-kernel/gentoo-kernel/Manifest |
20 |
@@ -28,6 +28,7 @@ DIST genpatches-5.4-166.base.tar.xz 4193772 BLAKE2B 0a06f3f716f07f15a01f96fc0f73 |
21 |
DIST genpatches-5.4-166.extras.tar.xz 1784 BLAKE2B 29955fdfe9d1f4a9f373cab61b9931a3f4d816e78766db02cb942951283ee5ba1968d3ed208164681fed488126210d93cf20731fe0b4e1d0274333bab75da360 SHA512 799d99c155d060e959728c311df73c6ae184be5a8a7b113f8714ccca0fc30a7b390bc534c138b6d37e00b7ae2e2277229caeefa047dc3b110df9d2e7a74b2ee6 |
22 |
DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713 |
23 |
DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c |
24 |
+DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f SHA512 5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d |
25 |
DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c |
26 |
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 |
27 |
DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c |
28 |
|
29 |
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild |
30 |
index 3b7488f75c84..afdca0ba9373 100644 |
31 |
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild |
32 |
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild |
33 |
@@ -10,7 +10,7 @@ GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) |
34 |
# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
35 |
CONFIG_VER=5.15.3 |
36 |
CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc |
37 |
-GENTOO_CONFIG_VER=5.13.4 |
38 |
+GENTOO_CONFIG_VER=5.15.5 |
39 |
|
40 |
DESCRIPTION="Linux kernel built with Gentoo patches" |
41 |
HOMEPAGE="https://www.kernel.org/" |
42 |
@@ -58,6 +58,8 @@ src_prepare() { |
43 |
) |
44 |
default |
45 |
|
46 |
+ local biendian=false |
47 |
+ |
48 |
# prepare the default config |
49 |
case ${ARCH} in |
50 |
amd64) |
51 |
@@ -68,9 +70,11 @@ src_prepare() { |
52 |
;; |
53 |
arm64) |
54 |
cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
55 |
+ biendian=true |
56 |
;; |
57 |
ppc64) |
58 |
cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
59 |
+ biendian=true |
60 |
;; |
61 |
x86) |
62 |
cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
63 |
@@ -101,5 +105,11 @@ src_prepare() { |
64 |
merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
65 |
fi |
66 |
fi |
67 |
+ |
68 |
+ # this covers ppc64 and aarch64_be only for now |
69 |
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
70 |
+ merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
71 |
+ fi |
72 |
+ |
73 |
kernel-build_merge_configs "${merge_configs[@]}" |
74 |
} |