]> www.infradead.org Git - users/hch/xfs.git/commitdiff
kbuild: rpm-pkg: avoid the warnings with dtb's listed twice
authorJose Ignacio Tornos Martinez <jtornosm@redhat.com>
Thu, 11 Jul 2024 16:49:19 +0000 (18:49 +0200)
committerMasahiro Yamada <masahiroy@kernel.org>
Sun, 14 Jul 2024 18:13:32 +0000 (03:13 +0900)
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>
scripts/package/kernel.spec

index fffc8af8deb17499d2f0d35dad884dfd0dd096c4..c52d517b93647d807df0b559ebf2aa13172b01b0 100644 (file)
@@ -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