summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ignacio Tornos Martinez <jtornosm@redhat.com>2024-07-11 18:49:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-07-18 13:22:56 +0200
commit12ed43ea736e24365d74c3af514de5a0cdd52bbf (patch)
tree2f15d3036528b14993c26c954cb48c2dc7f1fee5
parentd31bcf4b5f9dc646f3690ae499a791e44150978a (diff)
kbuild: rpm-pkg: avoid the warnings with dtb's listed twice
[ Upstream commit e3286434d220efb9a8b78f7241a5667974d2ec80 ] After 8d1001f7bdd0 (kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n), the following warning "warning: File listed twice: *.dtb" is appearing for every dtb file that is included. The reason is that the commented commit already adds the folder /lib/modules/%{KERNELRELEASE} in kernel.list file so the folder /lib/modules/%{KERNELRELEASE}/dtb is no longer necessary, just remove it. Fixes: 8d1001f7bdd0 ("kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n") Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--scripts/package/kernel.spec1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
index fffc8af8deb17..c52d517b93647 100644
--- a/scripts/package/kernel.spec
+++ b/scripts/package/kernel.spec
@@ -83,7 +83,6 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA
done
if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then
- echo "/lib/modules/%{KERNELRELEASE}/dtb"
find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n"
fi