fix: break dependency on sbuild_chroot for dpkg-prebuilt packages

Message ID 20221209144627.1087911-1-adriaan.schmidt@siemens.com
State Accepted, archived
Headers show
Series fix: break dependency on sbuild_chroot for dpkg-prebuilt packages | expand

Commit Message

Schmidt, Adriaan Dec. 9, 2022, 2:46 p.m. UTC
This is an optimization of dpkg-prebuilt, removing an unneccessary dependency
on the sbuild_chroot.

Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
 meta/classes/dpkg-prebuilt.bbclass | 2 ++
 1 file changed, 2 insertions(+)

Comments

Henning Schild Dec. 10, 2022, 6:21 p.m. UTC | #1
Am Fri, 9 Dec 2022 15:46:27 +0100
schrieb Adriaan Schmidt <adriaan.schmidt@siemens.com>:

> This is an optimization of dpkg-prebuilt, removing an unneccessary
> dependency on the sbuild_chroot.

Nice catch! ACK!

Henning

> Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> ---
>  meta/classes/dpkg-prebuilt.bbclass | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/classes/dpkg-prebuilt.bbclass
> b/meta/classes/dpkg-prebuilt.bbclass index 97e1e2de..f0341526 100644
> --- a/meta/classes/dpkg-prebuilt.bbclass
> +++ b/meta/classes/dpkg-prebuilt.bbclass
> @@ -19,6 +19,8 @@ python do_unpack_prepend() {
>  # break dependencies on do_patch, etc... but still support sstate
> caching deltask dpkg_build
>  addtask dpkg_build after do_unpack before do_deploy_deb
> +# break inherited (from dpkg-base) dependency on sbuild_chroot
> +do_dpkg_build[depends] = ""
>  do_dpkg_build() {
>      true
>  }
Anton Mikanovich Dec. 14, 2022, 7:25 a.m. UTC | #2
09.12.2022 17:46, Adriaan Schmidt wrote:
> This is an optimization of dpkg-prebuilt, removing an unneccessary dependency
> on the sbuild_chroot.
>
> Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>

Applied to next, thanks.

Patch

diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg-prebuilt.bbclass
index 97e1e2de..f0341526 100644
--- a/meta/classes/dpkg-prebuilt.bbclass
+++ b/meta/classes/dpkg-prebuilt.bbclass
@@ -19,6 +19,8 @@  python do_unpack_prepend() {
 # break dependencies on do_patch, etc... but still support sstate caching
 deltask dpkg_build
 addtask dpkg_build after do_unpack before do_deploy_deb
+# break inherited (from dpkg-base) dependency on sbuild_chroot
+do_dpkg_build[depends] = ""
 do_dpkg_build() {
     true
 }