Skip to content

Commit 12ed43e

Browse files
jtornosmgregkh
authored andcommitted
kbuild: rpm-pkg: avoid the warnings with dtb's listed twice
[ Upstream commit e328643 ] After 8d1001f (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: 8d1001f ("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>
1 parent d31bcf4 commit 12ed43e

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

scripts/package/kernel.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA
8383
done
8484

8585
if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then
86-
echo "/lib/modules/%{KERNELRELEASE}/dtb"
8786
find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n"
8887
fi
8988

0 commit comments

Comments
 (0)