[kernel] rewrite modinfo license check to be less noisy
Kyle McMartin
kyle at fedoraproject.org
Tue May 21 18:29:30 UTC 2013
commit 21284e0b9eaef498f01ae32defab31821b319a93
Author: Kyle McMartin <kmcmarti at redhat.com>
Date: Tue May 21 14:29:19 2013 -0400
rewrite modinfo license check to be less noisy
kernel.spec | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 005f016..19d74d0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1690,18 +1690,8 @@ BuildKernel() {
'drm_crtc_init'
# detect missing or incorrect license tags
- rm -f modinfo
- while read i
- do
- echo -n "${i#$RPM_BUILD_ROOT/lib/modules/$KernelVer/} " >> modinfo
- /sbin/modinfo -l $i >> modinfo
- done < modnames
-
- grep -E -v \
- 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' \
- modinfo && exit 1
-
- rm -f modinfo modnames
+ ( find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name '*.ko' | xargs /sbin/modinfo -l | \
+ grep -E -v 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' ) && exit 1
# Call the modules-extra script to move things around
%{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16}
@@ -2225,10 +2215,14 @@ fi
# ||----w |
# || ||
%changelog
+* Tue May 21 2013 Kyle McMartin <kyle at redhat.com>
+- Rewrite the modinfo license check to generate significantly less noise in
+ build logs.
+
* Tue May 21 2013 Peter Robinson <pbrobinson at fedoraproject.org>
- Enable OMAP5 on ARM multiplatform
-* Tue May 21 2013 Kyle McMartin <kmcmartin at redhat.com> - 3.10.0-0.rc2.git0.2
+* Tue May 21 2013 Kyle McMartin <kyle at redhat.com> - 3.10.0-0.rc2.git0.2
- Disable debugging options.
* Mon May 20 2013 Kyle McMartin <kyle at redhat.com> - 3.10.0-0.rc2.git0.1
More information about the scm-commits
mailing list