ACK Re: [SRU][PATCH][X,B] UBUNTU: dkms-build: fix wireguard build logging

[Tim Gardner]

On 2/9/21 4:33 PM, Kamal Mostafa wrote:
> The dkms-build script (<=bionic) fails to find and display the dkms
> build log for some dkms component(s), e.g. wireguard.
> 
> Add the missing path and logic matching >=focal's version of the script.
> 
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>   debian/scripts/dkms-build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build
> index 55d09d920746..5e5cef9bd3ec 100755
> --- a/debian/scripts/dkms-build
> +++ b/debian/scripts/dkms-build
> @@ -141,9 +141,9 @@ rc=0
>   	"$dkms_conf" || rc=1
>   
>   # Find the log and add it to our own.
> -for log in "$dkms_dir/build/$dkms_package/$dkms_version/$abi_flavour"/*/"log/make.log"
> +for log in "$dkms_dir/build/$dkms_package/$dkms_version/$abi_flavour"/*/"log/make.log" "$dkms_dir/build/$dkms_package/$dkms_version/build/make.log"
>   do
> -	break
> +	[ -f "$log" ] && break
>   done
>   sed -e "s@$dkms_dir@<<DKMSDIR>>@g" <"$log"
>   
> 

-- 
-----------
Tim Gardner
Canonical, Inc