[SRU,v2,X,B] UBUNTU: [Packaging] dkms-build: fix wireguard build logging

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.

Ignore: yes
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
---
[v2] Added "[Packaging]" and ACK's.

 debian/scripts/dkms-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

On 10.02.21 18:58, 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.
> 
> Ignore: yes
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> Acked-by: Stefan Bader <stefan.bader@canonical.com>
> Acked-by: Tim Gardner <tim.gardner@canonical.com>
> ---

Thanks Kamal, I probably should have been more explicit when replying. What I
meant was that whoever applies the patch, adds the missing pieces.

-Stefan

> [v2] Added "[Packaging]" and ACK's.
> 
>  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"
>  
>

On Wed, Feb 10, 2021 at 09:58:43AM -0800, 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.
> 
> Ignore: yes
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> Acked-by: Stefan Bader <stefan.bader@canonical.com>
> Acked-by: Tim Gardner <tim.gardner@canonical.com>

Applied to xenial,bionic:linux/master-next. Thank you for the updated
patch!

William Breathitt Gray

> ---
> [v2] Added "[Packaging]" and ACK's.
> 
>  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"
>  
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team