ACK/Cmnt: [SRU][PATCH][X,B] UBUNTU: dkms-build: fix wireguard build logging
Stefan Bader
stefan.bader at canonical.com
Wed Feb 10 15:34:59 UTC 2021
On 10.02.21 00:33, 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>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
Since this will have no effect on the produced binary kernel packages I think
not having a bug report is acceptable. But when this gets applied I would ask
for having the subject be "UBUNTU: [Packaging] ..." prefix and "Ignore: yes" in
the body.
-Stefan
> 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"
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210210/942ffdac/attachment.sig>
More information about the kernel-team
mailing list