From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-906106-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CD3CD138330
for <garchives@archives.gentoo.org>; Wed, 12 Oct 2016 14:27:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 32FA7E0B74;
Wed, 12 Oct 2016 14:27:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 18074E0B74
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2016 14:27:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EC9CD341644
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2016 14:27:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 559D82F4
for <gentoo-commits@lists.gentoo.org>; Wed, 12 Oct 2016 14:27:10 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1476282422.464b01fa4343a8ece67ddbbf014d092052c6e6b9.robbat2@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-kernel/genkernel/genkernel-9999.ebuild sys-kernel/genkernel/metadata.xml
X-VCS-Directories: sys-kernel/genkernel/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 464b01fa4343a8ece67ddbbf014d092052c6e6b9
X-VCS-Branch: master
Date: Wed, 12 Oct 2016 14:27:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9654c3d6-706d-4c9f-85ce-8446f5e1bd0c
X-Archives-Hash: 11e39ad95ac9c2adac3819519fe464f6
commit: 464b01fa4343a8ece67ddbbf014d092052c6e6b9
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 13:51:54 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 14:27:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464b01fa
sys-kernel/genkernel: also ensure local firmware can still be optionally used, bug #447100.
Package-Manager: portage-2.2.28
sys-kernel/genkernel/genkernel-9999.ebuild | 4 ++--
sys-kernel/genkernel/metadata.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 343794d..3cbe4ea 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 abf4d65..4185e70 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>