commit: d0e4c7844d50afdcc4ed623486c91fe057b97356 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 12 16:55:51 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 12 16:57:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e4c784
sys-kernel/vanilla-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/vanilla-kernel/Manifest | 4 - .../vanilla-kernel/vanilla-kernel-5.15.23.ebuild | 130 --------------------- .../vanilla-kernel/vanilla-kernel-5.15.24.ebuild | 130 --------------------- 3 files changed, 264 deletions(-) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 98cbe04e6406..40b3c0ac7e71 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -22,10 +22,6 @@ DIST linux-5.10.104.tar.sign 993 BLAKE2B eb6ce12c4b0dc92e2a0fcf60cb667974ab21380 DIST linux-5.10.104.tar.xz 120415232 BLAKE2B 097673237834c79eafd1dc2334402c8d4712c48d0fa6e511b4c388a835c82cdebb36cb3176a1e8ea4bcb7317d5a06ee5fa9f825a9933b94db87bb83c7952d43c SHA512 8676dfdd1b81c70815730b718995894037de3d4d3f3a65f1648aaa8792c4d54f51166e9cca948cf2d0a244a38777abb6b9fa1a3bef50b27f510ecdb1549145cd DIST linux-5.10.105.tar.sign 993 BLAKE2B a03e4136fcf202dcf567e042a266ec1c0c0a61ead845ccd1c8ec60bbb50e48768bdc4ae465e500d4248baa2002894ca96f1890ccaabfa299c470a5acb931961d SHA512 004041214bc78c84a3755b5c0a3d87575b4548e37d31b5d57608382bf6aa0bbdac92ecfa936a4414648c112c4cc3c658dc9cf1769b904a7211a70135876a5813 DIST linux-5.10.105.tar.xz 120378752 BLAKE2B 25ab3e77b201118ea22d621647a44c3d2b50b9eca057e6fb007cd53c9bf5b1aa7dfb0f26b54ac7e64d0fd016c329c174da10cc15b0433900885520b9828df578 SHA512 b0bb4c964a22d8d0ba917945213aa68a250dab05a2054896fa9d319f5189dd95570064f0bc0bf1424a8620dc58a50a7c011c93341b701b0b804d20c1b19292aa -DIST linux-5.15.23.tar.sign 991 BLAKE2B d085b784adc51f74b17156a43c22fa98221c80ef057ec132aa462ddba79bc193f1dd645a1a21e752ed0d5e52949b2aa77f0b1b7d4341313bfe3206013c8934fd SHA512 880aca81e1f4bad49850b904c8f78cc63e8e1eafee27a912e655ed609b2c552e7a1076fffb557d8f19f0af850f917b2ee43a9181f4559dbe67a41161776b002e -DIST linux-5.15.23.tar.xz 126202324 BLAKE2B 36be53585e67350496a84438712d35e488b745e85b6981f51448d9b19fe30cce9968ef486defd8a68f556e2518d010bf6f63dbf2bf7a504e25568e71c3aecacc SHA512 eb863fe0b62b7f2457bb66361fcb23a7a629a53dea3b23b26d012227d318cd09fd99b94763e88b593ead70eda1f58b702354155a043aed0ef1e68d5d1ba53ce1 -DIST linux-5.15.24.tar.sign 991 BLAKE2B 1807f81e43cdec5b5852eb5c9df6f17554466d4ed946740e1fe7ff17ca46c9c5ca07236127563bc2f249d2b4516e83c08e600b680c415c1cd76d4074f9c55547 SHA512 3ad52f00c39a9852b3f370c5b74eee375c7d64307a0f93f73542f407b8f6e72da7f9de483c6bf8fdc96dc52c8c053fb8c152cdff88db6fc5621a3905708e046d -DIST linux-5.15.24.tar.xz 126247188 BLAKE2B ae4e9738d78f4baeac1222b78b26fad45f04fa4db749b9ff594c3c86c462437941c8376bf91c8dae1db8008d4608ceb23ad1220a07c5b2074e0973c8ea77ede5 SHA512 b02862b341e10e06ce2ba29e4a28fc7173ef28ab9b75866aa7be8cd35f2666f6b2200e77c9ad22f103bead493eaae7286b429a55f0f5b68d794c06e58a69dcfa DIST linux-5.15.25.tar.sign 991 BLAKE2B dbb9ed0688150a6532f7485dd567b7ca8c865c54ea6f4949e71e7dc16110a6a21ead9a78e5606ebcedcd6eb80957c5213a91a88055f5751b83ca9e2c20641a30 SHA512 25b461a3d4f7cb8ec37a7217874db743a376c5cdd00a47772f5b3d7669fc9833b1dc110625b576a007fe7d763d5540fc4d4ec097d0a7d3d460f25e8212b03090 DIST linux-5.15.25.tar.xz 126242764 BLAKE2B 6bc93aebb0031f3ea1b5b84fabf4e643108800f495dc6900ea5dbcf0172583e5c50364f20cdbbf579205051eae37437c4ddfe9d1b8e3fbae1779fd4f6ba326f9 SHA512 a44994f41ce19d386899564e898536f51dbfe534a7d791743f4f09f3560dc8710caee6cbc566ad678420e14591f17517e138f09eb6323303bda0c8ea41135d07 DIST linux-5.15.27.tar.sign 991 BLAKE2B e36cb77225620f6e0ffa3ba3acd5ad39d2958b98dcece994a4511efd9839f5ebfc0593b1395106acb4155e60184686ce6a14a0fa5e73c631412f3de60a1a6f0f SHA512 5efa9bec242bdb7ff65915d23c6441700055a82ca46bbc806202905be53cedc48920d11d5643613a91a6361a482243a69467a240901e01baa989258d81b6e6e1 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.23.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.23.ebuild deleted file mode 100644 index 3b10562055bd..000000000000 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.23.ebuild +++ /dev/null @@ -1,130 +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 verify-sig - -MY_P=linux-${PV} -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 -CONFIG_VER=5.15.14 -CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f -GENTOO_CONFIG_VER=5.15.5 - -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/mgorny/gentoo-kernel-config/archive/v${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 ~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[@]}" -} diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.24.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.24.ebuild deleted file mode 100644 index 3b10562055bd..000000000000 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.24.ebuild +++ /dev/null @@ -1,130 +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 verify-sig - -MY_P=linux-${PV} -# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 -CONFIG_VER=5.15.14 -CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f -GENTOO_CONFIG_VER=5.15.5 - -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/mgorny/gentoo-kernel-config/archive/v${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 ~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[@]}" -}
