Introduce USE=firmware-loader, as suggested by williamh. Check whether kernel supports loading firmwares and warn properly.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

5 files changed, 61 insertions, 27 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index c186bc93fad3..775e51f7c50d 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.122 2013/04/17 18:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.123 2013/04/17 20:58:36 mgorny Exp $
+
+  17 Apr 2013; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  systemd-201.ebuild, systemd-9999.ebuild:
+  Introduce USE=firmware-loader, as suggested by williamh. Check whether kernel
+  supports loading firmwares and warn properly.
 
   17 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index eca7df86e3c4..a99d4938b683 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,26 +19,26 @@ DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-200-r1.ebuild 7304 SHA256 321931cf7a04ba7a681b6457d136e016a04ed6c40fe9fb1aadfddc359ec9eae8 SHA512 ed6a3ff8c3b37b3e50dce30e19d78f3c6cfa0fc8a730ddbe0665806c389460de30e60c5abfdc33cf50c61922d240cbc08f2ee7d06ca5e919ecf272ca3da484a4 WHIRLPOOL e497c7f8447475ee6f915779bfaac196470398e4292326c560f393f53600054bbe283ba96a2f2fbcf959358d405acec7de61aa5e248857b723f7280de34e45a4
-EBUILD systemd-201.ebuild 7439 SHA256 33eed409d154a82f1d4fb1241ffd2cb89d60b2b57e4dceff3aa1817e86a3cd36 SHA512 0b3998139f28b07ae593ea0f7497bf64389fb5b9be5a12310a2fd916e0ef91d7c36dfac93ce63e1f6ff67fb532fcef4d46218e4d3828f8fe7525f6a7555ea135 WHIRLPOOL 97e792da0ff934678862aa14d39ecd797f547991ffb2781985c0b709fb3902664dfd2b0e947947bd790846ebbd2b251b5f910b21ec619f467b83129889f2ecc9
-EBUILD systemd-9999.ebuild 7821 SHA256 062c53549df140d82724ba75c75504f677d30a72661b6b230f5c668511d254eb SHA512 ab11abc1cca323e43f634ed7479b34d8096b38109d86d947a51653f7e4e10dc6c1d257b4934f8d286c81d4a3652357606bb6bf99d4d78c7bc6fb4d7c228d78e1 WHIRLPOOL 36e4d0fb3029e0715527fb5dd8d1ed4ebe0c71ebdd678e755667f77130ef320419af09baa08f09d356da57719b418e748b1cb368712eea955bf036c7bd022eb3
-MISC ChangeLog 23369 SHA256 032640af5ee4d9f4ad1052e6ef1a64e1d12b4f698a4a49871cca5ef409faf0f2 SHA512 f7b85553562fc9d3a818a208ffe9978ad6e28aa69ba05b22356a3867c3c746708816d454bd34cbe657aaa07b02721892802d9c69051669b81e4380f118d88141 WHIRLPOOL d393cf21c920de485d655896193f529cac7b0bfd46051713d20b62c213173a8a73d4c027009cee4e21488dc13d1d447c49f4f521390546f299000ec751c37e2f
-MISC metadata.xml 1073 SHA256 71ae99fb50973ac5dfa88e7769819f33e0cb94008c291c2f619f5edec2bb6112 SHA512 3ab385e8bce57fa894a5752c8bb5a7ccbf93ffa04792192759ff09788fbc1c47bd85aee14bf5179ca03bae8f125e32aeda0bffb0c1561e06bc57e16ae197f053 WHIRLPOOL 189d679ddb184ec1a9dd853ba227c87bea14a92b99529ff972e6d62ba5c11cf7c1e85040d8b8160eade9c126b25edc5d25fec41201768bf05d12a9400c6d7997
+EBUILD systemd-201.ebuild 7837 SHA256 bef21dee9cab1a5834ea9df3f75141fdd7ea4925f273ac440c6ea562308d113b SHA512 3452ba616429951051d652d78b6d32b15651861357fd90364cc421eb2100e93be86be2a70907634405becc3639b83f5213013b56eb08a9962b126d97733bf079 WHIRLPOOL 1f7d8640ed1a0a2b9956cd408264034554f34e146f6a6b6ef9b1050f6c990d0bd9552572a0e3f2a914fda372154bf4e8aaebc83926a9637fa4d86bae1298ae80
+EBUILD systemd-9999.ebuild 8219 SHA256 78d598113d27255b741836d84f4ab4fb92d4535944e9d331ad601167e6d1ed9b SHA512 626aebf22e8688ec6865a2d40a3e08f56f0de79b5d0c0961a19397d38855827eb26fc730b1a6f771f16cdf57e17634e0be129554be44e9f98ed1e20559e34238 WHIRLPOOL d6ff00643628280df9c770b6d2d74b6a6468315a7d2c78b9a0cf210254be2888b0564cfea09f367bc423e17e65db0d08cfd66cbddc6f4a2e35fb540c96f72d92
+MISC ChangeLog 23605 SHA256 d7e066d209630da88f74a997a15566e0734022adfb7269b988361840e3168cf9 SHA512 effa866afe8f207463e48d15b7e21a356a38421d7cd6dc178e0a1d4d046bf4e4e5f477a8af5021335490f1b83a77af49b7b1126820e77a775c98a0901e9925e7 WHIRLPOOL 468d68bc31bfe17096f960053c69a2487f6d417e0086ab344e6419389afe06f2f3e09da6a96e352967d019b66a19d59c4e2d8f044bcd4fdb410c41e5f058b669
+MISC metadata.xml 1172 SHA256 b6e0889fe09aec75547501bfcc452db610154d3b9382f9d7f4ebf8e18b7d105a SHA512 4d15f3389e9629730c53cae58186ebe59ae5efc2692899427787a087b34244296ac5da9806fc6af3d3f00aaf9671cb4ef05e432a915cb6530021db261379ecd0 WHIRLPOOL f06b00c2c785fcc7e09ff57d1bcdfc238ebd435cb7c125f62878db62a1b992fa92dca216a783982e192458dc98267ab9af571904eae275f0e1ddd8a238eb918f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRbuvlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRbw1SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDa1gP/1zxLAF5poyFohzF4a+DC8s3
-VZTjhJ8v9FTvF4vR0mvaVhG1ZGxk9x7yAh6g+8fKjLv1PDQD06HuZ/q5SOrBh8Y6
-gigPPrtaocY61vtoK8gHf/P0yIw/WVNoMJ1OKIY6NeBKw6UmMQizVrUglD7wqfyv
-AXdmZTRxnCLhAuzDM24BuxNmQYQ+nc4F8KBv4Gh6PToJOClDP3d6qWSuirTrDDqe
-h6LhvZyLKLW2DwJpm7pSDQ5RewzIZG0GBuCu9KmILEzh+BykxcZthnlhflv9anAL
-zAwAnJHSqXhoRpJS9trV6NA9Eg+HrSPHSQROdDcYnHo5xVwA1BGZtSTFyGgdo004
-hHc9fJhAJpEhkLiMcsJ+zWMQxJbpiXJ/CjFRLSIwEZuNPiQL9z9Pbxt5lz45dh77
-07ZHVvVPGtB8iGOOIvPswY8OlMl6JgD8HNmY3bq9ObH0QX5SG1Hh4wtbgS/5Vm2f
-GSbRtQnJzH79kR9MTa5wFfi7kCo90kmM27yhlhj2tw1xUIWbM23ineg7A2gFMSTP
-VA5Hpha2eXWywthpPUDDkXXwT4oy94fsqxAYxI49Qb/f3bcKfCcfmGlDnwZRWcKv
-lFOkulFzEclX/58o78Omz8WEriqcbvKdJfJnJLXZKOCwH8fw+lzWFtSJ7l54XR9x
-OQqTTSkLIyEo5nPiG0IF
-=hXM8
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD6AQP+gMWHAplewKHsEImPF4r1/hl
+jfCQSkULM0juNLppcpAQmGJF0e/+WW/6SakGeP1WctzTLlUGKq5oBvhfehz1OQDY
+xPMXspV06G3cOEk7taMkZQz0WESffba2d7Y0Mxhoguk0H7ExuctKsCLW0kaoGy2B
+5qM6LCtXKPlTVgRilOhAJzo+EWBRLj49CWh5LlIDlBYJTNuyEvlVkKhXj77BgrG9
+KLfCiDWkCRQMlgJLNTg17ejjc5/uTiYNeVvPfunf0JDpZr1i1bYcYwCFaf9SVy4X
+zza7r7aZR9OvxRr7jYMk1co47LIGo9KfW9aCMZvdBCu9ZauEcqrRt7kgrGfHMtYv
+xQJVx4lG9xS3iA13bC/lAUDG72cZ8Wwkrm5L2t5kVnso81q51K27cBor88+TyHJf
+Bu2BSbc57kD0z6HBEXw7FWaPWDlP3MCP2kySvFk4hfQxYShiz/9vauCtwQ+7bTLd
+0qjUQZi9iGNTnXDi31olWWQBb4qbsv+j/ZvvYIn1U8IpeRN/CnEUdb9KA4G+7bMJ
+8RjswfOQa+pkO5GAZj6BTlXS3Q/3WjMPzA0FYCEbDyNe+ewXfDrv0OZ/TXRnaaKf
+r3edTjVh7ujxGjJJ5i6rDmnd1mmB+PcPadO5Pc4W7/RbkcNWA06XB04IlFHpHK5D
+f5R9R9zMFH/2kWSSnWZi
+=v59H
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index d9a66eac4dca..3223fc38dd23 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
 		<flag name='efi'>Enable EFI support (installs bootctl)</flag>
+		<flag name='firmware-loader'>Enable user-space firmware loader (for kernels prior to 3.8)</flag>
 		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
 		<flag name="gudev">enable libudev gobject interface</flag>
 		<flag name='http'>Enable embedded HTTP server in journald</flag>
diff --git a/sys-apps/systemd/systemd-201.ebuild b/sys-apps/systemd/systemd-201.ebuild
index bfd25d3e8fe8..b7e1f924c0da 100644
--- a/sys-apps/systemd/systemd-201.ebuild
+++ b/sys-apps/systemd/systemd-201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.7 2013/04/17 18:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.8 2013/04/17 20:58:36 mgorny Exp $
 
 EAPI=5
 
@@ -14,8 +14,8 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="acl audit cryptsetup doc gcrypt gudev http introspection keymap
-	+kmod lzma openrc pam policykit python qrcode selinux static-libs
+IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
+	keymap +kmod lzma openrc pam policykit python qrcode selinux static-libs
 	tcpd vanilla xattr"
 
 MINKV="2.6.39"
@@ -73,6 +73,15 @@ pkg_pretend() {
 		if kernel_is -lt ${MINKV//./ }; then
 			ewarn "Kernel version at least ${MINKV} required"
 		fi
+
+		if use firmware-loader; then
+			CONFIG_CHECK+=" ~FW_LOADER"
+		elif kernel_is -lt 3 8; then
+			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+			ewarn "require systemd with USE=firmware-loader to support loading"
+			ewarn "firmware. Missing this flag may cause some hardware not to work."
+		fi
+
 		check_extra_config
 	fi
 }
@@ -80,7 +89,6 @@ pkg_pretend() {
 src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var
-		--with-firmware-path="/lib/firmware/updates:/lib/firmware"
 		# but pam modules have to lie in /lib*
 		--with-pamlibdir=$(getpam_mod_dir)
 		# make sure we get /bin:/sbin in $PATH
@@ -123,6 +131,12 @@ src_configure() {
 	# Keep using the one where the rules were installed.
 	MY_UDEVDIR=$(get_udevdir)
 
+	if use firmware-loader; then
+		myeconfargs+=(
+			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		)
+	fi
+
 	# Work around bug 463846.
 	tc-export CC
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1de9f343abfb..79553009cf63 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.48 2013/04/17 18:35:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.49 2013/04/17 20:58:36 mgorny Exp $
 
 EAPI=5
 
@@ -22,8 +22,8 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="acl audit cryptsetup doc gcrypt gudev http introspection keymap
-	+kmod lzma openrc pam policykit python qrcode selinux static-libs
+IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
+	keymap +kmod lzma openrc pam policykit python qrcode selinux static-libs
 	tcpd vanilla xattr"
 
 MINKV="2.6.39"
@@ -97,6 +97,15 @@ pkg_pretend() {
 		if kernel_is -lt ${MINKV//./ }; then
 			ewarn "Kernel version at least ${MINKV} required"
 		fi
+
+		if use firmware-loader; then
+			CONFIG_CHECK+=" ~FW_LOADER"
+		elif kernel_is -lt 3 8; then
+			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+			ewarn "require systemd with USE=firmware-loader to support loading"
+			ewarn "firmware. Missing this flag may cause some hardware not to work."
+		fi
+
 		check_extra_config
 	fi
 }
@@ -104,7 +113,6 @@ pkg_pretend() {
 src_configure() {
 	local myeconfargs=(
 		--localstatedir=/var
-		--with-firmware-path="/lib/firmware/updates:/lib/firmware"
 		# but pam modules have to lie in /lib*
 		--with-pamlibdir=$(getpam_mod_dir)
 		# make sure we get /bin:/sbin in $PATH
@@ -147,6 +155,12 @@ src_configure() {
 	# Keep using the one where the rules were installed.
 	MY_UDEVDIR=$(get_udevdir)
 
+	if use firmware-loader; then
+		myeconfargs+=(
+			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		)
+	fi
+
 	# Work around bug 463846.
 	tc-export CC