Warn users with older kernel than 3.7 that they won't have anykind of firmware loading support.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 30 insertions, 18 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 3eedac8c02e9..e1a259f1b4d9 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1089 2014/09/17 14:09:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1090 2014/09/19 08:55:21 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+  Warn users with older kernel than 3.7 that they won't have anykind of firmware
+  loading support.
 
   17 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> udev-216.ebuild:
   amd64/x86 stable wrt #522778
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 32c015402cff..7c5a3b72b708 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -18,8 +18,8 @@ EBUILD udev-214.ebuild 15547 SHA256 4b4bd620b0ecec3a4911338f2a50a02c59fd0f48ef1b
 EBUILD udev-215-r1.ebuild 15421 SHA256 7a45c7fdb2cea26866fdb20ee8697ebda9ed1066c643744b9a69090ee6a86b49 SHA512 061c4bdaf48a2d76b50828e66f84cb9917e7d7976b8b3bd2139021c63a2f3cf9c53f5afca0ca5929a3af1adf4e546e8e43e646e5bde8b345504f1bf68ff2e4dd WHIRLPOOL df997ebcb6e088becfb54a7e34ecd6b8d84fea30fec71c647d58037ce37180d07d02c984b151eb066e39b2c1699a9aaea0ed954a14d43b5ee5b8750823732699
 EBUILD udev-215.ebuild 15378 SHA256 834f6a1e8f29046a54692cd8e2e6017b5838957ebd2e931f55c7a67cd65d09b1 SHA512 04c655a98d48be8ac7e09df1c01b68bf8ae6f9ef4256486f154d8c702f8335fc51cc73ce868a3d0a0fbd7924f8a9dfd5443fc078af8a1b0bec441beabeef5a46 WHIRLPOOL 071bbbd7fe39fc4ddc5d167340dc2a48a0941ec96d0b29017b62604f82149c76adf526ffa14ecc41b5d140ea61d14a396406a16762da5dc862af5558a48c4841
 EBUILD udev-216.ebuild 15296 SHA256 2c1985ce46acbdf53abc4bcf52dd050e1894567d42ecf9bd9c74f77934a5d207 SHA512 022e194ca3333366b9b1c3e5ab845ec1b9d6948644f11a769776d9b856726db3551849f1140cb4e513914e91aa33c7fb8e42d25aa76e089261334e94e8b227d0 WHIRLPOOL fff73631d0bee52328ba90aa3bbe7cd29966daac9801157ba49d2b5f8f17cb6988a452909f4abff2b4cb0a77ec56a7929e37d6e991c9de6038f0637633055ff8
-EBUILD udev-9999.ebuild 15216 SHA256 cc77d6322f6e6728bf48c55060eec7801187b83c04dd1ac56e50a44ceb9f7755 SHA512 a4136a873a49522f916c06f35fa8ef8d6397fa1a9173c6016fa93f030abded819eb091f37a59dbce003503a0fcb57a9a8ace4cb00830a36ba1091701e514f4bc WHIRLPOOL 4d608d7817fbcff8812af1002a93b3fc677313849603abda1e406da8025fbbce21870740354ed114c1ee64504c384bae25fa8e48ed13f04bc03cabefe59e8dfc
-MISC ChangeLog 57701 SHA256 9cd8b9dc84554403c9de928908f5df47ea9a68d4e9bb86a03bf33eb834286ed9 SHA512 8d7d4b5f1e176fd241318b8cf570dfd33da7b71951e6ef190dc4346d0f2606d21751e3ed5032864c7e62d28eebbc6b2af6ed0224a27c8ea58b59823adb6bf622 WHIRLPOOL 0f7ea079ab45c1183a7db1fb7ee25c51afc0ede556823d39f43fa0f11a7d04d4fefb5826de8b0475441db49b6e33e373ebaa45b2b0146ee6f073168e70565778
+EBUILD udev-9999.ebuild 15531 SHA256 e92456e8db8772a6b6ada7f32f58d3b89f7eab79b027c91da97de8490be352d8 SHA512 6a63dae92f866a22692203268cb3f7d406b3b06b81c851368a96604613947ba2d299c685ba2de8bac23723c553c2b36e213f6730aa54554475ef3e6a26388289 WHIRLPOOL bc845542105b00a5c9904657af35d06b72c36fd74fac1ff77e350c4be3ac3f8b708630574b75b5be2ab2196630defb287a256b023981f0a978332fb46b208b84
+MISC ChangeLog 57874 SHA256 55e11dd46e38918fee45f79daaf0f500ef238401340f54689d2d83d8c44eeaf7 SHA512 6576982cbc30c7eb6a1f4de43f486b7032d539cd3eb3143f31f09068586100fbf81e77148a2dc8c83748e7c037dcb154573249d3df2a305db4e2024799d79eae WHIRLPOOL 8c4b745938dac9f59f104c4454b10d1f680c7e3e3b1c556d601f14412e87258bbff28081bf1d4eb0b6dcd715a56ad65cf40108493e858b81d7933acb31088f0b
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -28,11 +28,11 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUGZYXAAoJEEdUh39IaPFN6KUH/j477WxsgvS4hqr+rQI7xQ0W
-6/HbaNedpw+K3WvGeQG5mI5utyHw+SnLqa/ZZg+hWDCi+WsVtB53XAI3ZWUq3gOK
-m0P1/s8R5BF9yKWtbFD/u0mJ1FfilzmOaJukaKY+sKu28klDKpF0UyclkrlUyqv6
-IQHEFUaJnKQ4tDF+3qWyORI1xo+N1j2DLr0yL0naNyglbVyBlw5txTJSIVhKBKG8
-f2IFbdq6oyslIM2CT0r2LsA/2Qy4DNRudxJRQUTK4dxeyL7V4hxS/2ufdDq8dShE
-vVHA5u7aHVdXQ/3uVbmRzUwbGoy9YdlBSfcXs0FL4muntu8nhqRTDW2BM4ciPnc=
-=qMn8
+iQEcBAEBCAAGBQJUG+94AAoJEEdUh39IaPFNwHAH/1gSBev58Kt/qnQw5ABU5zoN
+Taue+cfzbmL2udynp+zD3EzmgXy+tM2epAC4W1R6CSoRN54i9UfRbpDFhvVlEmLT
+zLyFM9AhaYo0RK0cZ2nF06lL0I1fqVTTt2K2Ewfo/Uk4fd+fzu6MNz9BOtt34Vlt
+AMKYXMOUoNKWzQP47bLkH5GBt3JjkFj7XayDDDSURg+kAvIf9WiGYY4DDmFB5CK/
+xbfaCPWlKJrpSk+DG6rHPceB0ThZCa6NV/z8itQjIoQxRtTq5nnTUbllxh44r625
+3TBxABCzDSEoy0eCNI7/qNGGRE2Zz+ah4R30Dth913+RTVrfIP6xDV0nvChuTTE=
+=0lMW
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 46aded15fbf6..187839ee6858 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.319 2014/08/31 14:14:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.320 2014/09/19 08:55:21 ssuominen Exp $
 
 EAPI=5
 
@@ -88,15 +88,23 @@ check_default_rules() {
 }
 
 pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
-	linux-info_pkg_setup
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+		linux-info_pkg_setup
 
-	# CONFIG_FHANDLE was introduced by 2.6.39
-	local MINKV=2.6.39
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
 
-	if kernel_is -lt ${MINKV//./ }; then
-		eerror "Your running kernel is too old to run this version of ${P}"
-		eerror "You need to upgrade kernel at least to ${MINKV}"
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
 	fi
 }