diff options
author | Michał Górny <mgorny@gentoo.org> | 2023-06-09 16:00:26 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2023-06-09 20:11:25 +0200 |
commit | 710d93b58161327ee52582edfeb840f0371e33bf (patch) | |
tree | ed8d09055f0410e1bd25d32742606f130d33fe20 /sys-kernel | |
parent | sys-kernel/vanilla-kernel: Bump to 6.1.33 (diff) | |
download | gentoo-710d93b58161327ee52582edfeb840f0371e33bf.tar.gz gentoo-710d93b58161327ee52582edfeb840f0371e33bf.tar.bz2 gentoo-710d93b58161327ee52582edfeb840f0371e33bf.zip |
sys-kernel/gentoo-kernel: Bump to 6.1.33
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/gentoo-kernel/Manifest | 2 | ||||
-rw-r--r-- | sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild | 140 |
2 files changed, 142 insertions, 0 deletions
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 9e63b4ae19a7..4a3d60e68ab2 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -14,6 +14,8 @@ DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb0 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55 DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26 SHA512 528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B 020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8 SHA512 9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823 +DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B 65193574bdd8fdf4dc5d78af616729db4f8e5ed4ad6fa22baccbe27cd0518175fd02acc218074c709b86831eda460a99013b2444c1f6ed358f545a3133afdc00 SHA512 d8015efd3980cf82f499a813589affc8d7b6acdcf748c17c9b3a4b41730676443611d6375e517c633bdb8d2119b1cbfe50bd8984885fd97c29455f00078d64f7 +DIST genpatches-6.1-38.extras.tar.xz 3812 BLAKE2B 648c0054d5088b51d17e8b825153c7fcc7988d973811dcae7ccd64bcd78b4634d410aaa848b3cb31272eec552ad410c705388b8887603d94b6cf5a5170f7b36d SHA512 313a119b47d954ebef9dea3a48024a8d4e7f3b4b62de74f19acdb997ece3e198872fc3c50e10171687b07e8bbf85c5b7dfd80045ed7184460fda3c68c29e8b9e DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild new file mode 100644 index 000000000000..d77da3bdbc2e --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild @@ -0,0 +1,140 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + amd64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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 + ;; + riscv) + return + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-gentoo-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[@]}" +} |