summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-10-12 06:51:54 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2016-10-12 07:27:02 -0700
commit464b01fa4343a8ece67ddbbf014d092052c6e6b9 (patch)
tree22b8630421dc5f44101183496bbed3e3d6c4f344
parentx11-themes/greybird-3.20.1-r2: stable for amd64 (diff)
downloadgentoo-464b01fa4343a8ece67ddbbf014d092052c6e6b9.tar.gz
gentoo-464b01fa4343a8ece67ddbbf014d092052c6e6b9.tar.bz2
gentoo-464b01fa4343a8ece67ddbbf014d092052c6e6b9.zip
sys-kernel/genkernel: also ensure local firmware can still be optionally used, bug #447100.
Package-Manager: portage-2.2.28
-rw-r--r--sys-kernel/genkernel/genkernel-9999.ebuild4
-rw-r--r--sys-kernel/genkernel/metadata.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 343794db86a1..3cbe4ea8df6f 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -51,7 +51,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="GPL-2"
SLOT="0"
RESTRICT=""
-IUSE="cryptsetup ibm selinux"
+IUSE="cryptsetup ibm +firmware selinux"
DEPEND="sys-fs/e2fsprogs
selinux? ( sys-libs/libselinux )"
@@ -59,7 +59,7 @@ RDEPEND="${DEPEND}
cryptsetup? ( sys-fs/cryptsetup )
app-arch/cpio
>=app-misc/pax-utils-0.2.1
- sys-kernel/linux-firmware
+ firmware? ( sys-kernel/linux-firmware )
!<sys-apps/openrc-0.9.9"
# pax-utils is used for lddtree
diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
index abf4d65c29d7..4185e7088e21 100644
--- a/sys-kernel/genkernel/metadata.xml
+++ b/sys-kernel/genkernel/metadata.xml
@@ -7,6 +7,7 @@
<use>
<flag name="crypt">Obsolete USE flag. Use cryptsetup for LUKS support. (bug ##414523)</flag>
<flag name="cryptsetup">Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag>
+ <flag name="firmware">Prefer system firmware <pkg>sys-kernel/linux-firmware</pkg> over local copy.</flag>
</use>
<upstream>
<remote-id type="sourceforge">fuse</remote-id>