commit: f7dc72d952046fd59123539fff16ea12dc9c3a8f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Oct 12 10:19:35 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Oct 12 10:23:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7dc72d9
sys-kernel/gentoo-kernel: Restore previous 5.15 stable-to-newest Bug: https://bugs.gentoo.org/876843 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/gentoo-kernel/Manifest | 6 + .../gentoo-kernel/gentoo-kernel-5.15.69.ebuild | 131 +++++++++++++++++++++ .../gentoo-kernel/gentoo-kernel-5.15.70.ebuild | 131 +++++++++++++++++++++ .../gentoo-kernel/gentoo-kernel-5.15.71.ebuild | 131 +++++++++++++++++++++ 4 files changed, 399 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index dfbf063a8ef4..0fbd7bf19fd3 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -1,5 +1,11 @@ DIST genpatches-5.10-156.base.tar.xz 4197792 BLAKE2B 0cf51ea19b117888e12a2c9fb474bcc3d3afb89c3d4fce23cc176231d8210f9f9527c8ca460477d616c249497908bf1c5325a28212e5fe5d92a3b4423d5fa1b1 SHA512 5ee474409975a9d715c2d483275cb6d90269ad3a4d9ab0873e686d7bbdec020288dd4c42ce863c6b184931ceb6a5d2e75e46d77bd8e5bc03607f8979e7a68ba3 DIST genpatches-5.10-156.extras.tar.xz 3868 BLAKE2B 0247f7dff2a4710426d541d61f5ac1319af5430222f8eaa8f752ac34fa0ef05ddbb7284cacf44d8db06fd42ee659dfb9bc5fb277e932e37d33327ecb8753e27e SHA512 7b827f4a62a11d65e9bab508f3b44e940078158fb41166acb7da814ba97e97f40558536d38026c0e63f93c23ab4505faebad4578e871e6133de9276a106ad872 +DIST genpatches-5.15-73.base.tar.xz 2997804 BLAKE2B 8915a7983e7766c43e7e4fb91f38ba690e60df58fb8c7d6b5f833b21df459bf5949c35e510275c793f6987e70923cdfebde739f498ca16f772920e262f391172 SHA512 3859fc75041d4c7593104e158ecf833fb0ff07aedec5143623132114308d9c877a9f2a405d83cf442f0048c046c3fa3700f51ab836de448ecf2c7b4064630c61 +DIST genpatches-5.15-73.extras.tar.xz 3928 BLAKE2B df7fca514f8db011bc263a94cba0406c7b95d2befcdc2f50600b1e71fce6a4e7314624a4eda38ae2037f4eddfb6ca4873b407fd075ed4b5ce23bd326cd03c48f SHA512 d4d5562d77ee0419bd17e0f447c84977a3adcb598655ea42eef83ab5452555dca4e2dee2355cf834c215cb22b12c9ef809da80108375d3a3aed09fff852681f2 +DIST genpatches-5.15-74.base.tar.xz 3006272 BLAKE2B aa1fb6c630e8ec452a067f56682ba7ba99185de818c6c6d8db467818dad51336a45b73485a76d788ee4ec0966fc7fabfc88074856cbd0340c8d26b9b448c4980 SHA512 b339fd9bb8916a37c2c78b4fbcda69a836e85fa88e4d96ecde37c64a7bf481aa847c5c5e76db8408eb8bb066b875b5b290fefa7b86d11084e138539ebbb423f2 +DIST genpatches-5.15-74.extras.tar.xz 3932 BLAKE2B 56ab108ca50876eede0c3aa9abdb7c1b4aba485b9ebd5f72b065d95e5f75c776b5454f457886cb9f3d3107438312f66af94543b3b95cad9b4dda20b512aaaa2c SHA512 dbea0a898270dbfed6f9622de259a54dfc2f858f32f7b456b71c5de7e614f390e87e200e08fedeb930622808c1d70d611931f4e4b36f227ab9b0b35307e35623 +DIST genpatches-5.15-75.base.tar.xz 3037892 BLAKE2B 33132be38bf46fc9a17a51708139f49f99bc66b839c5ce4f24147df859a5a781374b617c4b65bde9fba539aee681b5db89f0a326737e7c08b68c187c45752480 SHA512 b4837b6a8ddef64d717b2d92ad932523821b50c3d1c649c87a7a7cd9c8a345f09894f82ac41a5974ec24ae6407b754558b39e06cb1eb83e0a128c450ec2cc755 +DIST genpatches-5.15-75.extras.tar.xz 3932 BLAKE2B 7338afccdbd2831cd862ffb7a1aa4b694c62a292b4e72a9ad379899cbb010c3091944c0684bfbb81376ab833dca7e46745a02ebdaa6d33817de36b6506e6bb2e SHA512 ccbf4f6a5c5f3c527c19b5819597e1057018745176c16c159f497aa4ef158af9dd7d0e2c353dd83ec3e05e87a7db213030c9c23dd41a668c2a69351ededcfd41 DIST genpatches-5.15-76.base.tar.xz 3052120 BLAKE2B 679e6bf674b8ee6d550984af7c3603c6327ecd94b6dc2d6dc3dc44129353efb15ffc2993dc6d7d84f00457a7e81ed3038471f8286503d8954abd859ff24f8ab9 SHA512 d357e1991c65a2dee3346d247c3bdb71e1af1eaaf250e3dc09bf1aed11b1bc4ec8650ff902d281a5c9ff3d97184008061d0b9c60e7f416a5fbe43337aecb70b3 DIST genpatches-5.15-76.extras.tar.xz 3932 BLAKE2B 32f0645af1e0c0e4f2312a4310e955c3c12d9b802e3ebce2639f3e0f331a10cc2be237e43819921b5478c5ac6e430ea77671b5f08a0e6398744f018103875c24 SHA512 7cccdf49806cc6ede16dd3f0e16be89fdf8022f01005db3026467ceb680a36c131e3342b4ace26d77e25dad628de98dbdfed0658ab9ad7e41acbe6573dd1cabc DIST genpatches-5.19-16.base.tar.xz 886340 BLAKE2B 1b0a22eef6f1cd4fb253301b31ded1113753b1747ae72ac7c3a2fef198d5e28365d3178ffe5bdb7b17e5d4b07066d9c8b4dfb5123e78211f3cc04a3d474daf5d SHA512 c98d8388ea0a494271f0b5601328893f46ed5ea36ee1ea1b020b8e3aa6541ed6141c9ebe20e38d02212a076d8a77d845f878cec8a3813d1c455f70c9be561304 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.69.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.69.ebuild new file mode 100644 index 000000000000..594cf4733237 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.69.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 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##*.} + 4 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +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/projg2/gentoo-kernel-config/archive/${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 ~hppa ~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.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.70.ebuild new file mode 100644 index 000000000000..4ea02f952baa --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.70.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 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##*.} + 4 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +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/projg2/gentoo-kernel-config/archive/${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 ~hppa ~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.71.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.71.ebuild new file mode 100644 index 000000000000..4ea02f952baa --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.71.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 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##*.} + 4 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +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/projg2/gentoo-kernel-config/archive/${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 ~hppa ~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[@]}" +}
