diff mbox series

[v3] image-account-extenstion: rebuild on varflag changes

Message ID 20240418161131.623426-1-benedikt.niedermayr@siemens.com
State Accepted, archived
Headers show
Series [v3] image-account-extenstion: rebuild on varflag changes | expand

Commit Message

Benedikt Niedermayr April 18, 2024, 4:11 p.m. UTC 
From: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>

When adding items (e.g. foo) to the USER or GROUP variables, the
buildsystem automatically creates new variables (USER_foo).
One can then set these variables, or more precise, the variable
flags (e.g. USER_foo[password]) to control differents aspects
of the user creation.
Isar does not trigger a rebuild when applying changes to these
variable flags since they are not recognized by the
tasks signature generation.

The same applies to the USERS and GROUPS variables as well as
for the SOURCE_DATE_EPOCH variable.

Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
---
 meta/classes/image-account-extension.bbclass | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Comments

Uladzimir Bely April 26, 2024, 6:08 a.m. UTC | #1 
On Thu, 2024-04-18 at 18:11 +0200, 'B. Niedermayr' via isar-users
wrote:
> From: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> 
> When adding items (e.g. foo) to the USER or GROUP variables, the
> buildsystem automatically creates new variables (USER_foo).
> One can then set these variables, or more precise, the variable
> flags (e.g. USER_foo[password]) to control differents aspects
> of the user creation.
> Isar does not trigger a rebuild when applying changes to these
> variable flags since they are not recognized by the
> tasks signature generation.
> 
> The same applies to the USERS and GROUPS variables as well as
> for the SOURCE_DATE_EPOCH variable.
> 
> Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> ---
>  meta/classes/image-account-extension.bbclass | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/image-account-extension.bbclass
> b/meta/classes/image-account-extension.bbclass
> index 3d4e1d1dd175..45526da72cea 100644
> --- a/meta/classes/image-account-extension.bbclass
> +++ b/meta/classes/image-account-extension.bbclass
> @@ -8,6 +8,16 @@
>  USERS ??= ""
>  GROUPS ??= ""
>  
> +python() {
> +    for entry in (d.getVar("GROUPS") or "").split():
> +        group_entry = "GROUP_{}".format(entry)
> +        d.appendVarFlag("image_postprocess_accounts", "vardeps", "
> {}".format(group_entry))
> +
> +    for entry in (d.getVar("USERS") or "").split():
> +        user_entry = "USER_{}".format(entry)
> +        d.appendVarFlag("image_postprocess_accounts", "vardeps", "
> {}".format(user_entry))
> +}
> +
>  def image_create_groups(d: "DataSmart") -> None:
>      """Creates the groups defined in the ``GROUPS`` bitbake
> variable.
>  
> @@ -130,11 +140,12 @@ def image_create_users(d: "DataSmart") -> None:
>  
>  
>  ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts"
> +image_postprocess_accounts[vardeps] += "USERS GROUPS
> SOURCE_DATE_EPOCH"
>  python image_postprocess_accounts() {
>      import os
>      if d.getVar("SOURCE_DATE_EPOCH") != None:
>          os.environ["SOURCE_DATE_EPOCH"] =
> d.getVar("SOURCE_DATE_EPOCH")
> - 
> +
>      image_create_groups(d)
>      image_create_users(d)
>  }
> -- 
> 2.34.1
> 

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass
index 3d4e1d1dd175..45526da72cea 100644
--- a/meta/classes/image-account-extension.bbclass
+++ b/meta/classes/image-account-extension.bbclass
@@ -8,6 +8,16 @@ 
 USERS ??= ""
 GROUPS ??= ""
 
+python() {
+    for entry in (d.getVar("GROUPS") or "").split():
+        group_entry = "GROUP_{}".format(entry)
+        d.appendVarFlag("image_postprocess_accounts", "vardeps", " {}".format(group_entry))
+
+    for entry in (d.getVar("USERS") or "").split():
+        user_entry = "USER_{}".format(entry)
+        d.appendVarFlag("image_postprocess_accounts", "vardeps", " {}".format(user_entry))
+}
+
 def image_create_groups(d: "DataSmart") -> None:
     """Creates the groups defined in the ``GROUPS`` bitbake variable.
 
@@ -130,11 +140,12 @@  def image_create_users(d: "DataSmart") -> None:
 
 
 ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts"
+image_postprocess_accounts[vardeps] += "USERS GROUPS SOURCE_DATE_EPOCH"
 python image_postprocess_accounts() {
     import os
     if d.getVar("SOURCE_DATE_EPOCH") != None:
         os.environ["SOURCE_DATE_EPOCH"] = d.getVar("SOURCE_DATE_EPOCH")
- 
+
     image_create_groups(d)
     image_create_users(d)
 }