summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-12-22 20:45:31 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-12-22 20:45:31 +0000
commitdbf24e14c87f953aa3d18d000c376dd55b454962 (patch)
treee8efe0ce87d9e8e9a98fa5623d9f3253a55f71d7
parentcacd9faf19740547ae24be90011a155c5380c492 (diff)
sys-kernel/genkernel-next : revision bump (do not force firmware install)
-rw-r--r--sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch17
-rw-r--r--sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild (renamed from sys-kernel/genkernel-next/genkernel-next-63.ebuild)1
-rw-r--r--sys-kernel/genkernel-next/metadata.xml15
3 files changed, 18 insertions, 15 deletions
diff --git a/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch b/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch
new file mode 100644
index 00000000..8426c739
--- /dev/null
+++ b/sys-kernel/genkernel-next/files/genkernel-next-63-skip-firmware-install.patch
@@ -0,0 +1,17 @@
+diff -Nur a/gen_compile.sh b/gen_compile.sh
+--- a/gen_compile.sh 2015-02-16 10:03:04.000000000 +0000
++++ b/gen_compile.sh 2017-12-22 20:42:03.648220913 +0000
+@@ -293,10 +293,9 @@
+ local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_OUTPUTDIR}"/.config`
+ if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ]
+ then
+- print_info 1 " >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
+- MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
+- else
+- print_info 1 " >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
++ print_info 1 " >> Skip firmware installation as we rely on external linux-firmware package..."
++ else
++ print_info 1 " >> Skip firmware installation as we rely on external linux-firmware package..."
+ fi
+
+ local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild
index d7c304e8..d29d7b2c 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63-r1.ebuild
@@ -50,6 +50,7 @@ src_prepare() {
sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
die "Could not setup release"
+ epatch "${FILESDIR}"/"${P}"-skip-firmware-install.patch
epatch_user
}
diff --git a/sys-kernel/genkernel-next/metadata.xml b/sys-kernel/genkernel-next/metadata.xml
deleted file mode 100644
index 0a4a1a4e..00000000
--- a/sys-kernel/genkernel-next/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<maintainer>
- <email>lxnay@gentoo.org</email>
-</maintainer>
-<use>
- <flag name='cryptsetup'>Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag>
- <flag name='dmraid'>Enable support for DMRAID (include dmraid dependency)</flag>
- <flag name='gpg'>Enable support for GPG (include gnupg dependency)</flag>
- <flag name='iscsi'>Enable support for open-iscsi (include open-iscsi dependency)</flag>
- <flag name='plymouth'>Enable support for Plymouth (include Plymouth dependency)</flag>
-</use>
-</pkgmetadata>