commit: 31df3f6281fe45b9a2a1312b1299e2cecc6c78eb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 12 16:54:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 12 16:57:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31df3f62
sys-kernel/gentoo-kernel: drop 5.16.9, 5.16.10 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.16.10.ebuild | 126 --------------------- .../gentoo-kernel/gentoo-kernel-5.16.9.ebuild | 126 --------------------- 3 files changed, 256 deletions(-) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 92a42dad2da6..d45646f9d6eb 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,10 +10,6 @@ DIST genpatches-5.15-29.base.tar.xz 1228644 BLAKE2B af3556b699c911adc605d438be87 DIST genpatches-5.15-29.extras.tar.xz 3876 BLAKE2B 385e23598bf220d539807e751f3df8a11a74a032d8c0e0c45f9d1d67fc709018963a44eb839667e3a60ea35ab54ee6e335ff1902221256b03b7e14902f5080a1 SHA512 7c79e5cc35746aecfff088540f93b49968517b24845d64dc0aae3e719abd9bda8aa352dba710cc0529a168dcecab4aae4d857974014685ebb5b44259c318c522 DIST genpatches-5.15-30.base.tar.xz 1252580 BLAKE2B 75ba5a37233bd80d4526fb2f8dd53083c27a8a044a86e8738ccf544bf7b8dc974d0abfe57b09a3d98ab89562f378447cb767c9f8b2606b4e410b4237fe2c64f8 SHA512 4b81fa96dafdbc4c488ae46cf06ab1659dd89a24af0b536cf6e4153fda98c246b0f6fa6b808c403a17268a30c9077da94d1f97c0a7883afc997d586ec78e6b4a DIST genpatches-5.15-30.extras.tar.xz 3872 BLAKE2B 5bc792aea4f44f106687826ad6dc5474037b743ff20f8ae72b94b117877a81a93e2ce209cbd7a730920a3d548f1dd6155bbfa24ced46bbaba8c7352392de9611 SHA512 b727a9d4dbd24478479f86acffe0d1f074c1bf12dc19087c615de03a3e7e6efb8b0144476f480d1c87cfba0dc2097330af1234a2a194276ac9244058ea38b966 -DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B d590a7041f6309674e8000c735a232bb2f70d872863e4122fa5a8cc8bc0e68b641685b4bfb10c81d286124084eba2f6815e9d650978b52fa2fff70508ee361bd SHA512 cb591c67a3253b35d2d8dcbd229231507d28cbf2c1dbc2f734ba7e0fbfbeba6ca400f99bee6c9b94c90fad5facc9ee46c85fa4178087865d2e942a0717878a60 -DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4 SHA512 34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d -DIST genpatches-5.16-11.base.tar.xz 516420 BLAKE2B 3e3d1a7ed60355a6d0911742fe1fe27961bd6efe16c25bf700ffc9aadbd8d02860d8b35a9fa3de61bd6d59024364e698cf4d78a7abe2eefdadd79b5aa086778e SHA512 d513a67f55edd3ea469b36ecf93eda8f623fb2f899c8cb373ee5092838283fadda029db6d97687dc27b734634e666106c054d0f35498af086aadab4aa59a2e7d -DIST genpatches-5.16-11.extras.tar.xz 3796 BLAKE2B d4df94755fa8b69b345c6df4b9362d1b007c3ad420a6cfcbb9cea79da1e918db6944771cefae0985c63af5ada87f13de124aa96adbb80900a4fb5faab830685a SHA512 058a18c26fc651dacf9da50ad0eaf882f6760df29c37e8ddf2188151c4ec4131c094a04339c08bf54822e37c1b94e1d2c87b4cca7ed4b84d75bc19f80ebea784 DIST genpatches-5.16-12.base.tar.xz 589172 BLAKE2B 97e255628a387adc723a6f9bd5430860b1b9beeee2e7cf7a3106ef7219bf7d9ecce1b640181c277b725ee967846e7531bd9e0be1310ab63a43eb321b9dacd402 SHA512 7d298161666cae130bfd21fa1279245048cf59d78b9f237c063e0f3d4de47584736ea02267e96a948169c7c91b8b4d2b699136765b8a3118fdbd77cfb20192ad DIST genpatches-5.16-12.extras.tar.xz 3800 BLAKE2B d9c10bc2a613a2bb665c5c9f5cdb3be1383762f366066f65921fa2e52a8de492493a13ddec71d18925a90450c17f1ec185e7e19adf3400420723894dcd8e576d SHA512 2be8582426c64d37916ce072cfa6f30310628dff165c7d292be94be4a7124ce39c2a6ea6370ca0190aea0f0841693ba57cb9109c9340e50a4cbfca835a498670 DIST genpatches-5.16-14.base.tar.xz 685420 BLAKE2B 2d2152d6bd21f08de875946418c528aba0a319cf1a8cf13d8db56755c86482f0377c751a75123be1b955795163ee488a5d4faefde80025124fbb06dfbc6b8a24 SHA512 2bb3d401571d423f7028845063bb98590a0588c7da91a97d4b7ad77e0a20dd30af691fea1d54e4f8f987205072d558890cdb212b55688e32fb135aea10b6c047 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.10.ebuild deleted file mode 100644 index db3e66bbe857..000000000000 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.10.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##*.} + 1 )) -CONFIG_VER=5.16.8 -CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601 -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.16.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.9.ebuild deleted file mode 100644 index db3e66bbe857..000000000000 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.9.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##*.} + 1 )) -CONFIG_VER=5.16.8 -CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601 -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[@]}" -}
