diff mbox series

essential: Update dependency to account for recipe-local isar-apt copy

Message ID 538ec475-a06d-49ee-95bf-80d1685e3d5f@siemens.com
State Accepted, archived
Headers show
Series essential: Update dependency to account for recipe-local isar-apt copy | expand

Commit Message

Jan Kiszka Feb. 9, 2025, 9:20 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

We need the self-built deb already for do_local_isarapt, or we will
cache a stale version of isar-apt.

Fixes: 21a05608d85b ("dpkg-base: Copy isar_apt to workdir in separate task")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/essential.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Uladzimir Bely Feb. 18, 2025, 6:47 a.m. UTC | #1 
On Sun, 2025-02-09 at 10:20 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> We need the self-built deb already for do_local_isarapt, or we will
> cache a stale version of isar-apt.
> 
> Fixes: 21a05608d85b ("dpkg-base: Copy isar_apt to workdir in separate
> task")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/essential.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/essential.bbclass
> b/meta/classes/essential.bbclass
> index 2ae31b38..1ac5bc1f 100644
> --- a/meta/classes/essential.bbclass
> +++ b/meta/classes/essential.bbclass
> @@ -33,8 +33,8 @@ python() {
>  
>      # add dependencies to all packages from the essential list
>      for p in essential_packages:
> -        if d.getVar('do_prepare_build'):
> -            d.appendVarFlag('do_prepare_build', 'depends', f'
> {p}:do_deploy_deb')
> +        if d.getVar('do_local_isarapt'):
> +            d.appendVarFlag('do_local_isarapt', 'depends', f'
> {p}:do_deploy_deb')
>          if d.getVar('do_install_rootfs'):
>              d.appendVarFlag('do_install_rootfs', 'depends', f'
> {p}:do_deploy_deb')
>  }
> -- 
> 2.43.0
> 

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/classes/essential.bbclass b/meta/classes/essential.bbclass
index 2ae31b38..1ac5bc1f 100644
--- a/meta/classes/essential.bbclass
+++ b/meta/classes/essential.bbclass
@@ -33,8 +33,8 @@  python() {
 
     # add dependencies to all packages from the essential list
     for p in essential_packages:
-        if d.getVar('do_prepare_build'):
-            d.appendVarFlag('do_prepare_build', 'depends', f' {p}:do_deploy_deb')
+        if d.getVar('do_local_isarapt'):
+            d.appendVarFlag('do_local_isarapt', 'depends', f' {p}:do_deploy_deb')
         if d.getVar('do_install_rootfs'):
             d.appendVarFlag('do_install_rootfs', 'depends', f' {p}:do_deploy_deb')
 }