Re: [PATCH] fix(sstate): don't fail if there are no packages

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 11 Jan 2022 09:02:00 +0100
schrieb Adriaan Schmidt <adriaan.schmidt@siemens.com>:

> The code to put generated deb packages into the sstate cache
> currently uses the pattern
>   test <condition> && do_stuff
> which, if the condition is not met, not only skips do_stuff,
> but also returns failure.
> 
> The consequence is that in cases where there are no packages
> found in ${S}/../*.deb, the sstate caching fails completely.
> 
> This changes that pattern to use an explicit "if" instead.
> 
> Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> ---
>  meta/classes/dpkg-base.bbclass | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass
> b/meta/classes/dpkg-base.bbclass index cb5ce4a..2add0b2 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -222,13 +222,15 @@ do_dpkg_build[sstate-plaindirs] =
> "${DPKG_SSTATE}" do_dpkg_build[sstate-interceptfuncs] =
> "dpkg_build_sstate_prepare" 
>  dpkg_build_sstate_prepare() {
> -    test -n "$(find ${S}/.. -maxdepth 1 -name '*.deb' -print -quit)"
> &&
> +    if [ -n "$(find ${S}/.. -maxdepth 1 -name '*.deb' -print -quit)"
> ]; then ln -f ${S}/../*.deb -t ${DPKG_SSTATE}
> +    fi

I think we can skip the "-print" while at it. And is that hard linking
not problematic when DPKG_SSTATE and S are in different filesystems?

regards,
Henning

>  }
>  
>  dpkg_build_sstate_finalize() {
> -    test -n "$(find ${DPKG_SSTATE} -maxdepth 1 -name '*.deb' -print
> -quit)" &&
> +    if [ -n "$(find ${DPKG_SSTATE} -maxdepth 1 -name '*.deb' -print
> -quit)" ]; then ln -f ${DPKG_SSTATE}/*.deb -t ${S}/..
> +    fi
>  }
>  
>  python do_dpkg_build_setscene() {