On 10/12/2016 01:00 AM, Paul Bolle wrote:
For quite some time I see warnings like
    warning: File listed twice: /lib/modules/[...]/kernel

when building the kernel-core rpm. This is because that directory is included
both in module-dirs.list (and therefor in, basically, kernel-core.list) and in
kernel_variant_files().

Tweak the find command that generates module-dirs.list so that this directory
is not included in that list anymore.

Signed-off-by: Paul Bolle <pebo...@tiscali.nl>
---
Works as expected on my current local F24 based tree (that branched of
at release 4.6.5-300).

Applies cleanly to current master. But I have not tested this on that
branch.

 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index 1b7040b503e9..8d3f630b310b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1644,7 +1644,7 @@ BuildKernel() {

     # Go back and find all of the various directories in the tree.  We use this
     # for the dir lists in kernel-core
-    find lib/modules/$KernelVer/kernel -type d | sort -n > module-dirs.list
+    find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n > 
module-dirs.list

     # Cleanup
     rm System.map


Applied to rawhide. Thanks!
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org

Reply via email to