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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Kamal Mostafa-2
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 <[hidden email]>
---
 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
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Tim Gardner-2


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 <[hidden email]>
> ---
>   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

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Stefan Bader-2
In reply to this post by Kamal Mostafa-2
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 <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>
> ---

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"
>  
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
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 <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>
Acked-by: Tim Gardner <[hidden email]>
---
[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
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Stefan Bader-2
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 <[hidden email]>
> Acked-by: Stefan Bader <[hidden email]>
> Acked-by: Tim Gardner <[hidden email]>
> ---
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"
>  
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

William Breathitt Gray
In reply to this post by Kamal Mostafa-2
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 <[hidden email]>
> Acked-by: Stefan Bader <[hidden email]>
> Acked-by: Tim Gardner <[hidden email]>

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
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment