summaryrefslogtreecommitdiff
path: root/sys-kernel
diff options
context:
space:
mode:
authorMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-13 05:31:17 +0100
committerMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-13 05:31:17 +0100
commit64d5c692716aed7e736ce03e1237984891d35b7b (patch)
tree6b96ac69eacb80a6ee9bc328080966d43cbfa17c /sys-kernel
parent997964d290fb02120990d0dbe7e1d209f0b217a1 (diff)
parent45aeceadcc1aeda1a3bc0a746b3509b9caa41c88 (diff)
Merge pull request #43 from V3n3RiX/master
prevent genkernel from installing firmware files...please read the comment before merging @StefanCristian
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/genkernel-next/files/genkernel-next-dont-install-firmware-due-to-linux-firmware.patch15
-rw-r--r--sys-kernel/genkernel-next/genkernel-next-63.ebuild9
2 files changed, 22 insertions, 2 deletions
diff --git a/sys-kernel/genkernel-next/files/genkernel-next-dont-install-firmware-due-to-linux-firmware.patch b/sys-kernel/genkernel-next/files/genkernel-next-dont-install-firmware-due-to-linux-firmware.patch
new file mode 100644
index 00000000..83a0bde5
--- /dev/null
+++ b/sys-kernel/genkernel-next/files/genkernel-next-dont-install-firmware-due-to-linux-firmware.patch
@@ -0,0 +1,15 @@
+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 2015-06-12 23:34:12.536580015 +0100
+@@ -293,10 +293,7 @@
+ 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 " >> Not installing firmware due to CONFIG_FIRMWARE_IN_KERNEL != y...Make sure you have linux-firmware package installed"
+ 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.ebuild
index 95e7fd47..0c7adf4c 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
@@ -48,8 +48,13 @@ RDEPEND="${DEPEND}
src_prepare() {
sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
die "Could not setup release"
-
- epatch_user
+
+ # our new buildsystem revealed that genkernel installs firmware files, even
+ # if we use external linux-firmware package, thus creating conflicts during
+ # kernel building process ... this patch prevents this behaviour, and relies
+ # on linux-firmware already being installed ... and since linux-firmware
+ # is a dep of our kernel anyway ... you get the point
+ # epatch "${FILESDIR}/${PN}-dont-install-firmware-due-to-linux-firmware.patch"
}
src_install() {