[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

[David Seifert]

commit:     621b932602b093838e64d61f803f391c7a8aacd0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 26 12:50:57 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 12:50:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621b9326

sys-kernel/gentoo-kernel: Use latest template for 5.11.21

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../gentoo-kernel/gentoo-kernel-5.11.22.ebuild     | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild
index ec094664a50..f7430af864e 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.22.ebuild
@@ -39,16 +39,18 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
+IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
 RDEPEND="
        !sys-kernel/gentoo-kernel-bin:${SLOT}"
 BDEPEND="
-       debug? ( dev-util/dwarves )"
+       debug? ( dev-util/pahole )"
 PDEPEND="
        >=virtual/dist-kernel-${PV}"
 
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
 src_prepare() {
        local PATCHES=(
                # meh, genpatches have no directory
@@ -78,13 +80,26 @@ src_prepare() {
                        ;;
        esac
 
-       echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+       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
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+               "${dist_conf_path}"/base.config
        )
        use debug || merge_configs+=(
-               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+               "${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
        kernel-build_merge_configs "${merge_configs[@]}"
 }