| 1 |
commit: 913fc62c294926734d429ec6bf6944f663401f92 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 5 19:36:53 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 00:12:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913fc62c |
| 7 |
|
| 8 |
sys-kernel/vanilla-kernel: Bump to 5.4.170 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-kernel/vanilla-kernel/Manifest | 2 + |
| 13 |
.../vanilla-kernel/vanilla-kernel-5.10.90.ebuild | 2 +- |
| 14 |
.../vanilla-kernel/vanilla-kernel-5.15.13.ebuild | 2 +- |
| 15 |
....10.90.ebuild => vanilla-kernel-5.4.170.ebuild} | 73 ++++++++-------------- |
| 16 |
4 files changed, 29 insertions(+), 50 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
| 19 |
index 2a33f01f5475..ae43d99a028e 100644 |
| 20 |
--- a/sys-kernel/vanilla-kernel/Manifest |
| 21 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
| 22 |
@@ -35,3 +35,5 @@ DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b5 |
| 23 |
DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510 |
| 24 |
DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda SHA512 0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45 |
| 25 |
DIST linux-5.4.169.tar.xz 109192960 BLAKE2B 136c792f554832e6e52340ce935bf2f1b2b09c8bb8fab6889920b68bf27134e2d53f0228ec8ac31233a4b2a5b7faed87238d1c7d509ddd8c649ab8275a860e23 SHA512 43ba0a51c12e4366e0793217ce66dfefc13b83f0ab8a575a21058909e03f161410bff2aae272c64c5873779886d24d3fd0cc82655de5b20b428eca6cf681685e |
| 26 |
+DIST linux-5.4.170.tar.sign 991 BLAKE2B 225477d94c3645baa345a528c341f8e4ce4c1326d4901fc6e7d6919890f18ac750597b9e20908322b96419cc894613d96e2e9f0a99fcd288f91bdd8a640e212f SHA512 b61adc39a65c6643537b47dc6de6adfb24db6406ad14c982aa2a9beaaa0d2a705c1d22eb31ad16eb9ce093a52fdddc3667c5342fc41056817e6c15138af274eb |
| 27 |
+DIST linux-5.4.170.tar.xz 109202572 BLAKE2B 92c93457dd5cbacd2522ef71f3f5ad1ac97521ec46966ed8f46fd9ffbeaa986bd9c0ceaa96187e1b0beb76daef98ea0af1e49c2b7e92759fc7ffdf5a90204aba SHA512 aa2a36067f9015b63254e098522053993de4b31dbbf39050adbe4cec3b7e4249152ad5e154a9bf3ca2b2f60c4db274e8f4ed9df9c66d8a392653dd5de79554f8 |
| 28 |
|
| 29 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild |
| 30 |
index 2d0af917a6cc..54ba5f449c7a 100644 |
| 31 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild |
| 32 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild |
| 33 |
@@ -1,4 +1,4 @@ |
| 34 |
-# Copyright 2020-2021 Gentoo Authors |
| 35 |
+# Copyright 2020-2022 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=7 |
| 39 |
|
| 40 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild |
| 41 |
index f7731de3f3a6..9fed445a77ba 100644 |
| 42 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild |
| 43 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 2020-2021 Gentoo Authors |
| 46 |
+# Copyright 2020-2022 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
EAPI=7 |
| 50 |
|
| 51 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild |
| 52 |
similarity index 53% |
| 53 |
copy from sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild |
| 54 |
copy to sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild |
| 55 |
index 2d0af917a6cc..a68d501c5130 100644 |
| 56 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild |
| 57 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.170.ebuild |
| 58 |
@@ -1,15 +1,15 @@ |
| 59 |
-# Copyright 2020-2021 Gentoo Authors |
| 60 |
+# Copyright 2020-2022 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=7 |
| 64 |
|
| 65 |
-inherit kernel-build toolchain-funcs verify-sig |
| 66 |
+inherit kernel-build verify-sig |
| 67 |
|
| 68 |
MY_P=linux-${PV} |
| 69 |
# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
| 70 |
-CONFIG_VER=5.10.12 |
| 71 |
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 |
| 72 |
-GENTOO_CONFIG_VER=5.15.5 |
| 73 |
+CONFIG_VER=5.4.21 |
| 74 |
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea |
| 75 |
+GENTOO_CONFIG_VER=5.4.114 |
| 76 |
|
| 77 |
DESCRIPTION="Linux kernel built from vanilla upstream sources" |
| 78 |
HOMEPAGE="https://www.kernel.org/" |
| 79 |
@@ -21,27 +21,26 @@ SRC_URI+=" |
| 80 |
https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
| 81 |
) |
| 82 |
amd64? ( |
| 83 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config |
| 84 |
- -> kernel-x86_64-fedora.config.${CONFIG_VER} |
| 85 |
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config |
| 86 |
+ -> kernel-x86_64.config.${CONFIG_VER} |
| 87 |
) |
| 88 |
arm64? ( |
| 89 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config |
| 90 |
- -> kernel-aarch64-fedora.config.${CONFIG_VER} |
| 91 |
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config |
| 92 |
+ -> kernel-aarch64.config.${CONFIG_VER} |
| 93 |
) |
| 94 |
ppc64? ( |
| 95 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config |
| 96 |
- -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
| 97 |
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config |
| 98 |
+ -> kernel-ppc64le.config.${CONFIG_VER} |
| 99 |
) |
| 100 |
x86? ( |
| 101 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config |
| 102 |
- -> kernel-i686-fedora.config.${CONFIG_VER} |
| 103 |
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config |
| 104 |
+ -> kernel-i686.config.${CONFIG_VER} |
| 105 |
)" |
| 106 |
S=${WORKDIR}/${MY_P} |
| 107 |
|
| 108 |
LICENSE="GPL-2" |
| 109 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 110 |
-IUSE="debug hardened" |
| 111 |
-REQUIRED_USE="arm? ( savedconfig )" |
| 112 |
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86" |
| 113 |
+IUSE="debug" |
| 114 |
|
| 115 |
RDEPEND=" |
| 116 |
!sys-kernel/vanilla-kernel-bin:${SLOT}" |
| 117 |
@@ -68,19 +67,13 @@ src_unpack() { |
| 118 |
src_prepare() { |
| 119 |
default |
| 120 |
|
| 121 |
- local biendian=false |
| 122 |
- |
| 123 |
# prepare the default config |
| 124 |
case ${ARCH} in |
| 125 |
amd64) |
| 126 |
- cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
| 127 |
- ;; |
| 128 |
- arm) |
| 129 |
- return |
| 130 |
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die |
| 131 |
;; |
| 132 |
arm64) |
| 133 |
- cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
| 134 |
- biendian=true |
| 135 |
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die |
| 136 |
;; |
| 137 |
ppc) |
| 138 |
# assume powermac/powerbook defconfig |
| 139 |
@@ -88,43 +81,27 @@ src_prepare() { |
| 140 |
cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
| 141 |
;; |
| 142 |
ppc64) |
| 143 |
- cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
| 144 |
- biendian=true |
| 145 |
+ cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die |
| 146 |
;; |
| 147 |
x86) |
| 148 |
- cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
| 149 |
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die |
| 150 |
;; |
| 151 |
*) |
| 152 |
die "Unsupported arch ${ARCH}" |
| 153 |
;; |
| 154 |
esac |
| 155 |
|
| 156 |
- local myversion="-dist" |
| 157 |
- use hardened && myversion+="-hardened" |
| 158 |
- echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
| 159 |
- local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
| 160 |
- |
| 161 |
+ echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die |
| 162 |
local merge_configs=( |
| 163 |
"${T}"/version.config |
| 164 |
- "${dist_conf_path}"/base.config |
| 165 |
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config |
| 166 |
) |
| 167 |
use debug || merge_configs+=( |
| 168 |
- "${dist_conf_path}"/no-debug.config |
| 169 |
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config |
| 170 |
+ ) |
| 171 |
+ [[ ${ARCH} == x86 ]] && merge_configs+=( |
| 172 |
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config |
| 173 |
) |
| 174 |
- if use hardened; then |
| 175 |
- merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
| 176 |
- |
| 177 |
- tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
| 178 |
- |
| 179 |
- if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
| 180 |
- merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
| 181 |
- fi |
| 182 |
- fi |
| 183 |
- |
| 184 |
- # this covers ppc64 and aarch64_be only for now |
| 185 |
- if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
| 186 |
- merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
| 187 |
- fi |
| 188 |
|
| 189 |
kernel-build_merge_configs "${merge_configs[@]}" |
| 190 |
} |
Archives