From ccd6f4e1705d634ffd2aa863c73f43f5bcc4876f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 06:10:11 +0100 Subject: sys-kernel/linux-{image,sources}-redcore : version bump --- sys-kernel/linux-image-redcore/Manifest | 1 + ...ata-fix-NCQ-LOG-strings-and-move-to-debug.patch | 23 ++++ .../files/fix-spectre_v2-mitigation-strings.patch | 28 ++++ .../linux-image-redcore-4.16.5.ebuild | 145 +++++++++++++++++++++ sys-kernel/linux-sources-redcore/Manifest | 1 + ...ata-fix-NCQ-LOG-strings-and-move-to-debug.patch | 23 ++++ .../files/fix-spectre_v2-mitigation-strings.patch | 28 ++++ .../linux-sources-redcore-4.16.5.ebuild | 73 +++++++++++ 8 files changed, 322 insertions(+) create mode 100644 sys-kernel/linux-image-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch create mode 100644 sys-kernel/linux-image-redcore/files/fix-spectre_v2-mitigation-strings.patch create mode 100644 sys-kernel/linux-image-redcore/linux-image-redcore-4.16.5.ebuild create mode 100644 sys-kernel/linux-sources-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch create mode 100644 sys-kernel/linux-sources-redcore/files/fix-spectre_v2-mitigation-strings.patch create mode 100644 sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.5.ebuild diff --git a/sys-kernel/linux-image-redcore/Manifest b/sys-kernel/linux-image-redcore/Manifest index ffa51885..4d64576b 100644 --- a/sys-kernel/linux-image-redcore/Manifest +++ b/sys-kernel/linux-image-redcore/Manifest @@ -1 +1,2 @@ DIST linux-4.16.4.tar.xz 103021400 BLAKE2B 31a0d2fc58cd5d1a8506758d9ae588e4eeabaa7c0d922929be7fed73f9221f82b5948c19d371d53b383e7942395f698d431b3c0e5100fbbd9425e1275cf66077 SHA512 2ace0bd4298be0956f650eee910aa8fc3a6fc3ce33be18469965d6f70fe37640a94c22c3cccd9f2721134ab1136d1b9901906a4bc467f65abfaec242781e9af2 +DIST linux-4.16.5.tar.xz 103015696 BLAKE2B 156b20b6fb40f7a2b4e48def0ee6d775d9f4551b9c57ad8857e37b7da27be29b59d88d988f723a99268e35f3de3af9cf1bbc694157c6170e50279064ef055d4d SHA512 892cb32b58c57d2d5f45515228a6b4280d70d284c88eb913743411ff968016094eddb5a5c9914c86790e3792239a74a77ef2a4e4a7bb0c0d3121b1426ead0668 diff --git a/sys-kernel/linux-image-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch b/sys-kernel/linux-image-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch new file mode 100644 index 00000000..344a8c4b --- /dev/null +++ b/sys-kernel/linux-image-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch @@ -0,0 +1,23 @@ +diff -Naur linux-4.16.5/drivers/ata/libata-core.c linux-4.16.5-p/drivers/ata/libata-core.c +--- linux-4.16.5/drivers/ata/libata-core.c 2018-04-26 11:00:39.000000000 +0200 ++++ linux-4.16.5-p/drivers/ata/libata-core.c 2018-04-28 02:19:06.632381413 +0200 +@@ -2201,7 +2201,7 @@ + unsigned int err_mask; + + if (!ata_log_supported(dev, ATA_LOG_NCQ_SEND_RECV)) { +- ata_dev_warn(dev, "NCQ Send/Recv Log not supported\n"); ++ ata_dev_dbg(dev, "NCQ Send/Recv Log not supported\n"); + return; + } + err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_SEND_RECV, +@@ -2230,8 +2230,8 @@ + unsigned int err_mask; + + if (!ata_log_supported(dev, ATA_LOG_NCQ_NON_DATA)) { +- ata_dev_warn(dev, +- "NCQ Send/Recv Log not supported\n"); ++ ata_dev_dbg(dev, ++ "NCQ Non-Data Log not supported\n"); + return; + } + err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA, diff --git a/sys-kernel/linux-image-redcore/files/fix-spectre_v2-mitigation-strings.patch b/sys-kernel/linux-image-redcore/files/fix-spectre_v2-mitigation-strings.patch new file mode 100644 index 00000000..f77bb823 --- /dev/null +++ b/sys-kernel/linux-image-redcore/files/fix-spectre_v2-mitigation-strings.patch @@ -0,0 +1,28 @@ +diff -Naur linux-4.16.5/arch/x86/kernel/cpu/bugs.c linux-4.16.5-p/arch/x86/kernel/cpu/bugs.c +--- linux-4.16.5/arch/x86/kernel/cpu/bugs.c 2018-04-26 11:00:39.000000000 +0200 ++++ linux-4.16.5-p/arch/x86/kernel/cpu/bugs.c 2018-04-28 02:34:28.424306602 +0200 +@@ -292,13 +292,13 @@ + if ((!boot_cpu_has(X86_FEATURE_PTI) && + !boot_cpu_has(X86_FEATURE_SMEP)) || is_skylake_era()) { + setup_force_cpu_cap(X86_FEATURE_RSB_CTXSW); +- pr_info("Spectre v2 mitigation: Filling RSB on context switch\n"); ++ pr_info("Mitigation: Filling RSB on context switch\n"); + } + + /* Initialize Indirect Branch Prediction Barrier if supported */ + if (boot_cpu_has(X86_FEATURE_IBPB)) { + setup_force_cpu_cap(X86_FEATURE_USE_IBPB); +- pr_info("Spectre v2 mitigation: Enabling Indirect Branch Prediction Barrier\n"); ++ pr_info("Mitigation: Enabling Indirect Branch Prediction Barrier\n"); + } + + /* +@@ -307,7 +307,7 @@ + */ + if (boot_cpu_has(X86_FEATURE_IBRS)) { + setup_force_cpu_cap(X86_FEATURE_USE_IBRS_FW); +- pr_info("Enabling Restricted Speculation for firmware calls\n"); ++ pr_info("Mitigation: Enabling Restricted Speculation for firmware calls\n"); + } + } + diff --git a/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.5.ebuild b/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.5.ebuild new file mode 100644 index 00000000..04947ac5 --- /dev/null +++ b/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.5.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +EXTRAVERSION="redcore" +KV_FULL="${PV}-${EXTRAVERSION}" + +DESCRIPTION="Official Redcore Linux Kernel Image" +HOMEPAGE="https://redcorelinux.org" +SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz" + +KEYWORDS="amd64" +LICENSE="GPL-2" +SLOT="${PV}" +IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm" + +RESTRICT="binchecks strip mirror" +DEPEND=" + app-arch/xz-utils + sys-devel/autoconf + sys-devel/bc + sys-devel/make + cryptsetup? ( sys-fs/cryptsetup ) + dmraid? ( sys-fs/dmraid ) + dracut? ( >=sys-kernel/dracut-0.44-r8 ) + dkms? ( sys-kernel/dkms ~sys-kernel/linux-sources-redcore-${PV} ) + mdadm? ( sys-fs/mdadm ) + >=sys-kernel/linux-firmware-20180314" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/enable_alx_wol.patch + "${FILESDIR}"/0001-Revert-ath10k-activate-user-space-firmware-loading-a.patch + "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch + "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch + "${FILESDIR}"/0001-Make-it-possible-to-disable-SWIOTLB-code-on-admgpu-a.patch + "${FILESDIR}"/fix-spectre_v2-mitigation-strings.patch + "${FILESDIR}"/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch + "${FILESDIR}"/mute-pps_state_mismatch.patch + "${FILESDIR}"/drop_ancient-and-wrong-msg.patch + "${FILESDIR}"/nouveau-pascal-backlight.patch + "${FILESDIR}"/linux-hardened-v2.patch + "${FILESDIR}"/uksm-for-linux-hardened.patch ) + +S="${WORKDIR}"/linux-"${PV}" + +pkg_setup() { + export KBUILD_BUILD_USER="nexus" + export KBUILD_BUILD_HOST="nexus.redcorelinux.org" + + export REAL_ARCH="$ARCH" + unset ARCH ; unset LDFLAGS #will interfere with Makefile if set +} + +src_prepare() { + default + emake mrproper + sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile + cp "${FILESDIR}"/"${EXTRAVERSION}"-amd64.config .config +} + +src_compile() { + emake prepare modules_prepare + emake bzImage modules +} + +src_install() { + dodir boot + insinto boot + newins .config config-"${KV_FULL}" + newins System.map System.map-"${KV_FULL}" + newins arch/x86/boot/bzImage vmlinuz-"${KV_FULL}" + + dodir usr/src/linux-"${KV_FULL}" + insinto usr/src/linux-"${KV_FULL}" + doins Module.symvers + doins System.map + exeinto usr/src/linux-"${KV_FULL}" + doexe vmlinux + + emake INSTALL_MOD_PATH="${D}" modules_install + + rm -f "${D}"lib/modules/"${KV_FULL}"/build + rm -f "${D}"lib/modules/"${KV_FULL}"/source + export local KSYMS + for KSYMS in build source ; do + dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}" + done +} + +_grub2_update_grubcfg() { + if [[ -x $(which grub2-mkconfig) ]]; then + elog "Updating GRUB-2 bootloader configuration, please wait" + grub2-mkconfig -o "${ROOT}"boot/grub/grub.cfg + else + elog "It looks like you're not using GRUB-2, you must update bootloader configuration by hand" + fi +} + +_dracut_initrd_create() { + if [[ -x $(which dracut) ]]; then + elog "Generating initrd for "${KV_FULL}", please wait" + addpredict /etc/ld.so.cache~ + dracut -f --no-hostonly-cmdline --kver="${KV_FULL}" "${ROOT}"boot/initrd-"${KV_FULL}" + else + elog "It looks like you're not using dracut, you must generate an initrd by hand" + fi +} + +_dracut_initrd_delete() { + rm -rf "${ROOT}"boot/initrd-"${KV_FULL}" +} + +_dkms_modules_delete() { + if [[ -x $(which dkms) ]] ; then + export local DKMSMOD + for DKMSMOD in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g') ; do + dkms remove "${DKMSMOD}" -k "${KV_FULL}" + done + fi +} + +_kernel_modules_delete() { + rm -rf "${ROOT}"lib/modules/"${KV_FULL}" +} + +pkg_postinst() { + if use dracut; then + _dracut_initrd_create + fi + _grub2_update_grubcfg +} + +pkg_postrm() { + if use dracut; then + _dracut_initrd_delete + fi + if use dkms; then + _dkms_modules_delete + fi + _kernel_modules_delete + _grub2_update_grubcfg +} diff --git a/sys-kernel/linux-sources-redcore/Manifest b/sys-kernel/linux-sources-redcore/Manifest index ffa51885..4d64576b 100644 --- a/sys-kernel/linux-sources-redcore/Manifest +++ b/sys-kernel/linux-sources-redcore/Manifest @@ -1 +1,2 @@ DIST linux-4.16.4.tar.xz 103021400 BLAKE2B 31a0d2fc58cd5d1a8506758d9ae588e4eeabaa7c0d922929be7fed73f9221f82b5948c19d371d53b383e7942395f698d431b3c0e5100fbbd9425e1275cf66077 SHA512 2ace0bd4298be0956f650eee910aa8fc3a6fc3ce33be18469965d6f70fe37640a94c22c3cccd9f2721134ab1136d1b9901906a4bc467f65abfaec242781e9af2 +DIST linux-4.16.5.tar.xz 103015696 BLAKE2B 156b20b6fb40f7a2b4e48def0ee6d775d9f4551b9c57ad8857e37b7da27be29b59d88d988f723a99268e35f3de3af9cf1bbc694157c6170e50279064ef055d4d SHA512 892cb32b58c57d2d5f45515228a6b4280d70d284c88eb913743411ff968016094eddb5a5c9914c86790e3792239a74a77ef2a4e4a7bb0c0d3121b1426ead0668 diff --git a/sys-kernel/linux-sources-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch b/sys-kernel/linux-sources-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch new file mode 100644 index 00000000..344a8c4b --- /dev/null +++ b/sys-kernel/linux-sources-redcore/files/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch @@ -0,0 +1,23 @@ +diff -Naur linux-4.16.5/drivers/ata/libata-core.c linux-4.16.5-p/drivers/ata/libata-core.c +--- linux-4.16.5/drivers/ata/libata-core.c 2018-04-26 11:00:39.000000000 +0200 ++++ linux-4.16.5-p/drivers/ata/libata-core.c 2018-04-28 02:19:06.632381413 +0200 +@@ -2201,7 +2201,7 @@ + unsigned int err_mask; + + if (!ata_log_supported(dev, ATA_LOG_NCQ_SEND_RECV)) { +- ata_dev_warn(dev, "NCQ Send/Recv Log not supported\n"); ++ ata_dev_dbg(dev, "NCQ Send/Recv Log not supported\n"); + return; + } + err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_SEND_RECV, +@@ -2230,8 +2230,8 @@ + unsigned int err_mask; + + if (!ata_log_supported(dev, ATA_LOG_NCQ_NON_DATA)) { +- ata_dev_warn(dev, +- "NCQ Send/Recv Log not supported\n"); ++ ata_dev_dbg(dev, ++ "NCQ Non-Data Log not supported\n"); + return; + } + err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA, diff --git a/sys-kernel/linux-sources-redcore/files/fix-spectre_v2-mitigation-strings.patch b/sys-kernel/linux-sources-redcore/files/fix-spectre_v2-mitigation-strings.patch new file mode 100644 index 00000000..f77bb823 --- /dev/null +++ b/sys-kernel/linux-sources-redcore/files/fix-spectre_v2-mitigation-strings.patch @@ -0,0 +1,28 @@ +diff -Naur linux-4.16.5/arch/x86/kernel/cpu/bugs.c linux-4.16.5-p/arch/x86/kernel/cpu/bugs.c +--- linux-4.16.5/arch/x86/kernel/cpu/bugs.c 2018-04-26 11:00:39.000000000 +0200 ++++ linux-4.16.5-p/arch/x86/kernel/cpu/bugs.c 2018-04-28 02:34:28.424306602 +0200 +@@ -292,13 +292,13 @@ + if ((!boot_cpu_has(X86_FEATURE_PTI) && + !boot_cpu_has(X86_FEATURE_SMEP)) || is_skylake_era()) { + setup_force_cpu_cap(X86_FEATURE_RSB_CTXSW); +- pr_info("Spectre v2 mitigation: Filling RSB on context switch\n"); ++ pr_info("Mitigation: Filling RSB on context switch\n"); + } + + /* Initialize Indirect Branch Prediction Barrier if supported */ + if (boot_cpu_has(X86_FEATURE_IBPB)) { + setup_force_cpu_cap(X86_FEATURE_USE_IBPB); +- pr_info("Spectre v2 mitigation: Enabling Indirect Branch Prediction Barrier\n"); ++ pr_info("Mitigation: Enabling Indirect Branch Prediction Barrier\n"); + } + + /* +@@ -307,7 +307,7 @@ + */ + if (boot_cpu_has(X86_FEATURE_IBRS)) { + setup_force_cpu_cap(X86_FEATURE_USE_IBRS_FW); +- pr_info("Enabling Restricted Speculation for firmware calls\n"); ++ pr_info("Mitigation: Enabling Restricted Speculation for firmware calls\n"); + } + } + diff --git a/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.5.ebuild b/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.5.ebuild new file mode 100644 index 00000000..fb4966f3 --- /dev/null +++ b/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +EXTRAVERSION="redcore" +KV_FULL="${PV}-${EXTRAVERSION}" + +DESCRIPTION="Official Redcore Linux Kernel Sources" +HOMEPAGE="https://redcorelinux.org" +SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz" + +KEYWORDS="amd64" +LICENSE="GPL-2" +SLOT="${PV}" +IUSE="" + +RESTRICT="strip mirror" +DEPEND=" + app-arch/xz-utils + sys-devel/autoconf + sys-devel/bc + sys-devel/make" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/enable_alx_wol.patch + "${FILESDIR}"/0001-Revert-ath10k-activate-user-space-firmware-loading-a.patch + "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch + "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch + "${FILESDIR}"/0001-Make-it-possible-to-disable-SWIOTLB-code-on-admgpu-a.patch + "${FILESDIR}"/fix-spectre_v2-mitigation-strings.patch + "${FILESDIR}"/ata-fix-NCQ-LOG-strings-and-move-to-debug.patch + "${FILESDIR}"/mute-pps_state_mismatch.patch + "${FILESDIR}"/drop_ancient-and-wrong-msg.patch + "${FILESDIR}"/nouveau-pascal-backlight.patch + "${FILESDIR}"/linux-hardened-v2.patch + "${FILESDIR}"/uksm-for-linux-hardened.patch ) + +S="${WORKDIR}"/linux-"${PV}" + +pkg_setup() { + export KBUILD_BUILD_USER="nexus" + export KBUILD_BUILD_HOST="nexus.redcorelinux.org" + + export REAL_ARCH="$ARCH" + unset ARCH ; unset LDFLAGS #will interfere with Makefile if set +} + +src_prepare() { + default + emake mrproper + sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile + cp "${FILESDIR}"/"${EXTRAVERSION}"-amd64.config .config +} + +src_compile() { + emake prepare modules_prepare +} + +src_install() { + dodir usr/src/linux-"${KV_FULL}" + cp -ax "${S}"/* "${D}"usr/src/linux-"${KV_FULL}" +} + +_kernel_sources_delete() { + rm -rf "${ROOT}"usr/src/linux-"${KV_FULL}" +} + +pkg_postrm() { + _kernel_sources_delete +} -- cgit v1.2.3