summaryrefslogtreecommitdiff
path: root/sys-kernel
diff options
context:
space:
mode:
authorMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-13 20:52:13 +0100
committerMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-13 20:52:13 +0100
commit928b30ee5a1bc803aa72334a527d297cc6a126a1 (patch)
tree9cff17037f5522140c26ab440bb4b1eccaaa0af2 /sys-kernel
parent21b0f39e357b95c5f279cea4f01dcc4d4d1f3af2 (diff)
parent116d613326bc01ba8a909e25cd466d3e905a06c9 (diff)
Merge pull request #48 from V3n3RiX/master
this commit reverts 44100938da8282c32f29c0d97722ae68d653ce91
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.ebuild7
2 files changed, 0 insertions, 22 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
deleted file mode 100644
index 83a0bde5..00000000
--- a/sys-kernel/genkernel-next/files/genkernel-next-dont-install-firmware-due-to-linux-firmware.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 39312e8b..9ed0fc8c 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
@@ -48,13 +48,6 @@ RDEPEND="${DEPEND}
src_prepare() {
sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
die "Could not setup release"
-
- # 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() {