linux-kbuild.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] kbuild: fix kernel-devel RPM package and linux-headers Deb package
@ 2023-09-10 12:44 Masahiro Yamada
  2023-09-11  9:37 ` Nicolas Schier
  0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2023-09-10 12:44 UTC (permalink / raw)
  To: linux-kbuild
  Cc: linux-kernel, Masahiro Yamada, Karolis M, Nathan Chancellor,
	Nick Desaulniers, Nicolas Schier

Since commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package
and linux-headers Deb package"), the kernel-devel RPM package and
linux-headers Deb package are broken.

I double-quoted the $(find ... -type d), which resulted in newlines
being included in the argument to the outer find comment.

  find: 'arch/arm64/include\narch/arm64/kvm/hyp/include': No such file or directory

The outer find command is unneeded.

Fixes: fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package and linux-headers Deb package")
Reported-by: Karolis M <k4rolis@protonmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/install-extmod-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/install-extmod-build b/scripts/package/install-extmod-build
index af7fe9f5b1e4..8a7051fad087 100755
--- a/scripts/package/install-extmod-build
+++ b/scripts/package/install-extmod-build
@@ -20,7 +20,7 @@ mkdir -p "${destdir}"
 	find "arch/${SRCARCH}" -maxdepth 1 -name 'Makefile*'
 	find include scripts -type f -o -type l
 	find "arch/${SRCARCH}" -name Kbuild.platforms -o -name Platform
-	find "$(find "arch/${SRCARCH}" -name include -o -name scripts -type d)" -type f
+	find "arch/${SRCARCH}" -name include -o -name scripts -type d
 ) | tar -c -f - -C "${srctree}" -T - | tar -xf - -C "${destdir}"
 
 {
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] kbuild: fix kernel-devel RPM package and linux-headers Deb package
  2023-09-10 12:44 [PATCH] kbuild: fix kernel-devel RPM package and linux-headers Deb package Masahiro Yamada
@ 2023-09-11  9:37 ` Nicolas Schier
  0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Schier @ 2023-09-11  9:37 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: linux-kbuild, linux-kernel, Karolis M, Nathan Chancellor,
	Nick Desaulniers

On Sun, Sep 10, 2023 at 09:44:13PM +0900, Masahiro Yamada wrote:
> Since commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package
> and linux-headers Deb package"), the kernel-devel RPM package and
> linux-headers Deb package are broken.
> 
> I double-quoted the $(find ... -type d), which resulted in newlines
> being included in the argument to the outer find comment.
> 
>   find: 'arch/arm64/include\narch/arm64/kvm/hyp/include': No such file or directory
> 
> The outer find command is unneeded.
> 
> Fixes: fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package and linux-headers Deb package")
> Reported-by: Karolis M <k4rolis@protonmail.com>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  scripts/package/install-extmod-build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/package/install-extmod-build b/scripts/package/install-extmod-build
> index af7fe9f5b1e4..8a7051fad087 100755
> --- a/scripts/package/install-extmod-build
> +++ b/scripts/package/install-extmod-build
> @@ -20,7 +20,7 @@ mkdir -p "${destdir}"
>  	find "arch/${SRCARCH}" -maxdepth 1 -name 'Makefile*'
>  	find include scripts -type f -o -type l
>  	find "arch/${SRCARCH}" -name Kbuild.platforms -o -name Platform
> -	find "$(find "arch/${SRCARCH}" -name include -o -name scripts -type d)" -type f
> +	find "arch/${SRCARCH}" -name include -o -name scripts -type d
>  ) | tar -c -f - -C "${srctree}" -T - | tar -xf - -C "${destdir}"
>  
>  {
> -- 
> 2.39.2

Reviewed-by: Nicolas Schier <n.schier@avm.de>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-09-11 21:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-10 12:44 [PATCH] kbuild: fix kernel-devel RPM package and linux-headers Deb package Masahiro Yamada
2023-09-11  9:37 ` Nicolas Schier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).