[ptxdist] [PATCH] image-rauc: improve error detection for hook script

[ptxdist] [PATCH] image-rauc: improve error detection for hook script

[Roland Hieber]

If config/images/rauc-hooks.sh is not found, genimage will instead try
to copy a file with an empty file name from the temporary build folder,
resulting in the less helpful error message about "cp: -r not specified;
omitting directory". Catch this case early and error out with a better
message.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/image-rauc.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index def2ade1e237..a05c19f61de2 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -41,6 +41,10 @@ IMAGE_RAUC_BUNDLE_FORMAT := "crypt"
 endif
 
 ifdef PTXCONF_IMAGE_RAUC_HOOK
+ifndef IMAGE_RAUC_HOOK_FILE
+$(error IMAGE_RAUC_HOOK is enabled, but config/images/rauc-hooks.sh was not \
+	found in any component of PTXDIST_PATH)
+endif
 IMAGE_RAUC_ENV_HOOK = \
 	RAUC_HOOK_FILE="file hooks.sh { image = \\"$(IMAGE_RAUC_HOOK_FILE)\\" }" \
 	RAUC_HOOK_MANIFEST="filename=hooks.sh"
-- 
2.39.2

Re: [ptxdist] [APPLIED] image-rauc: improve error detection for hook script

[Michael Olbrich]

Thanks, applied as 1da289a90f19c4f5aa56cf76c2c7a73aae5f756f.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:13 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> If config/images/rauc-hooks.sh is not found, genimage will instead try
> to copy a file with an empty file name from the temporary build folder,
> resulting in the less helpful error message about "cp: -r not specified;
> omitting directory". Catch this case early and error out with a better
> message.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240220101909.1090342-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/image-rauc.make b/rules/image-rauc.make
> index def2ade1e237..a05c19f61de2 100644
> --- a/rules/image-rauc.make
> +++ b/rules/image-rauc.make
> @@ -41,6 +41,10 @@ IMAGE_RAUC_BUNDLE_FORMAT := "crypt"
>  endif
>  
>  ifdef PTXCONF_IMAGE_RAUC_HOOK
> +ifndef IMAGE_RAUC_HOOK_FILE
> +$(error IMAGE_RAUC_HOOK is enabled, but config/images/rauc-hooks.sh was not \
> +	found in any component of PTXDIST_PATH)
> +endif
>  IMAGE_RAUC_ENV_HOOK = \
>  	RAUC_HOOK_FILE="file hooks.sh { image = \\"$(IMAGE_RAUC_HOOK_FILE)\\" }" \
>  	RAUC_HOOK_MANIFEST="filename=hooks.sh"