commit: bc42bd2bca1c733ffd743ed62aa758f46df4b312 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 12 16:54:29 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 12 16:57:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc42bd2b
sys-kernel/gentoo-kernel: drop 5.15.23, 5.15.24 Bug: https://bugs.gentoo.org/834729 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/gentoo-kernel/Manifest | 4 - .../gentoo-kernel/gentoo-kernel-5.15.23.ebuild | 126 --------------------- .../gentoo-kernel/gentoo-kernel-5.15.24.ebuild | 126 --------------------- 3 files changed, 256 deletions(-) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index ade306b86fcc..92a42dad2da6 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,10 +4,6 @@ DIST genpatches-5.10-111.base.tar.xz 3106252 BLAKE2B 2b55a1c6fe10c58823227616020 DIST genpatches-5.10-111.extras.tar.xz 3876 BLAKE2B a162482853b09b14c83a1b53f0e425431115a9b4bbd7c929656b56533aef562338ddc75394963db7550ce41c613203287d98692b96dab28ae6dc2cc7350a2128 SHA512 2792748f9e51af82896b19de21608bd5e092f6e89a7f362084b662aea489d4446e664e80867cccd38425a6ed3eec6e4d2e200dddf1675024fbabb1848d1952ca DIST genpatches-5.10-112.base.tar.xz 3129120 BLAKE2B 89e3a95facb0b67c8d4a9157c8e82a89ed4fd68febe1b52f9299ec9df08515293943596950e82a9acc95c448c7cdfbac97aff30bf40df326941cf38a0340edfa SHA512 04c6c2a632383b7b1404f1390cb0e7954ad9401c5c5c4a30d87b36ad757e94299d70461cc2517f345ae1a7289b33a49025c09e10ac602f1fc9ffc52dd9d3d522 DIST genpatches-5.10-112.extras.tar.xz 3876 BLAKE2B 3a5372d5e9a4105d6f7fea19c5defdc823430c823bf89131990c9af1785e8943dd3d9175a5cf591f335bcfd3bc23be1ce928d95f574b895e5a3c949c65e858ef SHA512 69950dc907bc047052e13ce01f1b1eb465d58d101bee75789300cc8f41f3d11632be220831f4b908b48659eac2b13867ef8d77eb3564dc7fc7d712ef23e313cc -DIST genpatches-5.15-25.base.tar.xz 1018612 BLAKE2B 493b8c695f2bfcdfa36712143ffad423883273b48e0ae45db226d9e12b809764538716fa8dc257d0cb211f9db50f6af437cc8d19dde0e8af5a10accf85a3b4be SHA512 f268ace309d283079e0f491a3a77de56d4a18fa31bba643be4d215f931baf6a251d1e28c358d4b606b0ea15fc34e71f6b13901f5eb95f18ebad79f384bb6e5a9 -DIST genpatches-5.15-25.extras.tar.xz 3876 BLAKE2B 17a20913e907e6b6a87afdd7775b7f9811bc3eed5374b957244242fdbc655519606063656bb8e5f51ded3168f73e99832d0cdf66e830811dc1e5ea0c0b8a2582 SHA512 1b8f4424996351a70c26f5a90c2490078c1a8daa80da578e2e3b3d1c4be6a4474d40cbd2e6fae8b1f1b9389cdaf2257e01a14ac6c2f7ece8a883d745555a686e -DIST genpatches-5.15-26.base.tar.xz 1059876 BLAKE2B d3a7b03647f3ce4a10ac4b75e52723d26cd56f880ca786883c236b3569c7312555ca57325a039bf9713cb44b930190b2e099de6ef9d677a9cd5e8ef9179fb52e SHA512 241f1cf431626fd0f406f5a661363a29293a23057c58a4cf63bce6383d126e4f276be371eda670abec8699036d46c1896788f1f56d47239fdb9eeec6d5c8a51b -DIST genpatches-5.15-26.extras.tar.xz 3872 BLAKE2B 84bf993010dbdf678e9c42e5807bcd1cbf6066d0ffacad81d8a3d7c16c65cf0b59b219e691aca1fb6932e6aaaed9a0eabcea8921e8042e5e6f57d0ae45e53826 SHA512 55cc9f5f2cb30f2b81b7815254d2932f851f5691fdc92c5a01b3a8977392ac9eebcb77b826571530ed435c4504560dcaeeab65e0c51c35c23599876b4992bb62 DIST genpatches-5.15-27.base.tar.xz 1109928 BLAKE2B 4f6113b0b1c378bec52a94c420265c3454b4b46dca3ebe25cf9bbd3d65761ac2d1bf14a5f60afcd974ceb319036c4e84adf247632bd93174dc144779d1169f8d SHA512 77f39c84e78e64ed221a813292a3391ba1252c7bb5206d78f2e2c4b8fa3e6f082cd327ac45c30851840e62288f2958470d271d9ad2afbda2fa9f21d4b4f07c56 DIST genpatches-5.15-27.extras.tar.xz 3872 BLAKE2B fc757f0d4fcba7b53aea34736b7a0cc0a7ca14b73bd9c249ad2c89b283475f3b53e4391870a239bd329f00e55c056f05cfc270ad00d57acd69cc26331cc20931 SHA512 102dc6ec977e184ec07cc3cdc2a39285f291bd3e3a344b5e53935f90319efcb5ca70ea1936d5d37ffe03f66148aad4e240508e3cf212d483abe145c21e6818c3 DIST genpatches-5.15-29.base.tar.xz 1228644 BLAKE2B af3556b699c911adc605d438be870f2bba25e79c24908cc8ef6e130e238ada7f415faab020a2cad99780c99e9ce0e8d2f69784883a7ad6596f76db55f0b32f93 SHA512 ee152e485e0fd21b9f350fae7d492a72408b6b16f2abbdc73f62d22ce402e59e83e2ce23c4940dcfc914c8f2ee411524b590745693cebcf60237c64b0fc7a76e diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild deleted file mode 100644 index 284cfd3f4e12..000000000000 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.23.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kernel-build toolchain-funcs - -MY_P=linux-${PV%.*} -GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) -CONFIG_VER=5.15.14 -CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f -GENTOO_CONFIG_VER=5.15.5 - -DESCRIPTION="Linux kernel built with Gentoo patches" -HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz - -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz - 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 ~ppc ppc64 x86" -IUSE="debug hardened" -REQUIRED_USE="arm? ( 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 - ;; - 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[@]}" -} diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.24.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.24.ebuild deleted file mode 100644 index 1ae96dd74de4..000000000000 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.24.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kernel-build toolchain-funcs - -MY_P=linux-${PV%.*} -GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) -CONFIG_VER=5.15.14 -CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f -GENTOO_CONFIG_VER=5.15.5 - -DESCRIPTION="Linux kernel built with Gentoo patches" -HOMEPAGE="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/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz - -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz - 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 ~ppc ~ppc64 ~x86" -IUSE="debug hardened" -REQUIRED_USE="arm? ( 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 - ;; - 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[@]}" -}
