kbuild: rpm-pkg: avoid the warnings with dtb's listed twice

[PATCH] kbuild: rpm-pkg: avoid the warnings with dtb's listed twice

Posted by Jose Ignacio Tornos Martinez 1 year, 5 months ago

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.

Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
---
 scripts/package/kernel.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
index 4b7df76076c4..74355ff0e106 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
 
-- 
2.45.2

Re: [PATCH] kbuild: rpm-pkg: avoid the warnings with dtb's listed twice

Posted by Masahiro Yamada 1 year, 5 months ago

On Fri, Jul 12, 2024 at 1:49 AM Jose Ignacio Tornos Martinez
<jtornosm@redhat.com> wrote:
>
> 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.
>
> Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
> ---


Applied to linux-kbuild.
Thanks!




-- 
Best Regards
Masahiro Yamada

Re: [PATCH] kbuild: rpm-pkg: avoid the warnings with dtb's listed twice

Posted by Nathan Chancellor 1 year, 5 months ago

On Thu, Jul 11, 2024 at 06:49:19PM +0200, Jose Ignacio Tornos Martinez wrote:
> 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.
> 
> Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>

Guess I'm not looking back in my build logs...

Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  scripts/package/kernel.spec | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
> index 4b7df76076c4..74355ff0e106 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
>  
> -- 
> 2.45.2
>