commit:     9bcac6788bf8af152211c6105f7904e9c273db5f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 14:15:45 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 20:23:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcac678

sys-kernel/vanilla-kernel: Bump to 5.15.82

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.82.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index a41e379f3c38..1f115792dca8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-5.15.80.tar.sign 991 BLAKE2B 
755c03e2ac0a88fcb973fc66e6d697056817d26c
 DIST linux-5.15.80.tar.xz 126478832 BLAKE2B 
750121c79c4c7a64735cfe9417eb15689d1e9796810c4ae1f56f2bba9ee5cf4c5c920fa8d8962b24c7ca016ca6e23749a5da86310e52e6710744f61f2704cf0f
 SHA512 
6434e6010678dd3c15b201ad9dd12a2a6d8293522038052259fb9957346296b156aa8ef29b6b7207de3ce4ffdb3af41bbef4255a9f73971eb15a2513c9901fb3
 DIST linux-5.15.81.tar.sign 991 BLAKE2B 
f2a1c630bfee0e4d6757ec9c7e8775492d67bfa4da396a78fd9f7d25986d46aab6cb9e16d138f46bfc7bec86686a8e08eedb9009d3fe92bfd6c1703cfeee7be9
 SHA512 
a4b33ff45d5e4afa8fee11c568bcb0d7a351e2354dc2e60a4f4300c3daf1d25727c390e7c1148d8e433a792beb953316f6ffea27f3cdf9c6c1460c4ec14ba792
 DIST linux-5.15.81.tar.xz 126480696 BLAKE2B 
d961466fcf7050b24ef2d52497bf1d6387064079030ee093c1f09ea66132a1414444d1111eb8b6cee551322cc4a074e8766bcd4062a92dddb311db9598ae6e05
 SHA512 
5a4cae2ee07ce73518b2f66bfb1b1f9f9aa5442ab5c5714c9bbe531cd721717810f3a0fe2a2cbbb033981bc535802fb07bd935682bfd6cae71349178a77b8319
+DIST linux-5.15.82.tar.sign 991 BLAKE2B 
247e7b87b7b81e51e3062df977aa13f5cf4e3d9ed93d581f3428fc311afe97bf234e157e4915335ed0542ea107e9aa078ea8eb72b05cd3249b48a5cb31872ca6
 SHA512 
fad2b24ac1a6af27b6da9010e6e0e1edc5a38b677a8d6307a8f6cc4340a894766d94565fc687d6b2b4d04a81c855a40ac8a7c848514ed2c12261b3fe57be0c50
+DIST linux-5.15.82.tar.xz 126475300 BLAKE2B 
709eab3894d3d57e580dc2c467b035a7e271aecbb7627e53cf667ef8d7ed6c5a31afaff893b29b63adc9d6955490f2fe9be25c666b7b51f8382407b3769ed4ff
 SHA512 
b0deb17077d9254e9a6eef853cdbcb7cbdde74cafef214d25961929d02a42fd61d306e3358b17a145999a0df3565c985de6149bd078330c63508ce8ce6fb4938
 DIST linux-5.4.223.tar.sign 991 BLAKE2B 
83aff68008cb382f7d6a9be93ecf6737cd3dc7d7291da646b24d74f9930bcc072bb4033a54d4c9cf0a3088ab908995f61186ae84c05a4b9f3834ffed271ed7ff
 SHA512 
e9fb0e7fa915ffa1b72a9f9e447fb4afb834611921bb5e12ee6b7291385bf8e3d6113f7d9c3587cacaacb14acd8fbeb067eef1f44ef90be40ce8ea6b1cfd3e09
 DIST linux-5.4.223.tar.xz 112946132 BLAKE2B 
e5669ba0e0e05d468eb8671da24fac4188a6cdbf66201d3a4c66759435997be541994dee2e3f297f6968857c675dd9c6485efde87f9421f7cc0618b692b005ac
 SHA512 
45fb543b2ef59be495106e253bbb2249fe71f9727a9a7d7a16738820db12f9fb5f580594699f736d157f930cf3a712e09595689a3f9954cfebbfa99f04ffc681
 DIST linux-5.4.224.tar.sign 991 BLAKE2B 
dc31a065cb747f537923a743d84a473e3724413141242a351d684b155578272156e4476646f3eb5b5bda2fee190604234294a155faf72d7075d60cba32d4b2a8
 SHA512 
13a8c4e7b2500ae32b22c0fd49f447a3ae2cb673922ae8ce478dbd713aa09acbc0f7ac2356d1d9303a537dc1710d485d50c4607e6f98ec7055604e1fd4b44ef5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.82.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.82.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.82.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       amd64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to