[PATCH 1/2] meta: targz-img: chown image file to building user

[PATCH 1/2] meta: targz-img: chown image file to building user

[Henning Schild]

From: Henning Schild <henning.schild@siemens.com>

Make sure the image is not owned by root:root.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/targz-img.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
index d9dadae..af12ae1 100644
--- a/meta/classes/targz-img.bbclass
+++ b/meta/classes/targz-img.bbclass
@@ -8,6 +8,7 @@ TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
 do_targz_image() {
     rm -f ${TARGZ_IMAGE_FILE}
     sudo tar -cvzf ${TARGZ_IMAGE_FILE} --one-file-system -C ${IMAGE_ROOTFS} .
+    sudo chown $(id -u):$(id -g) ${TARGZ_IMAGE_FILE}
 }
 
 addtask targz_image before do_image after do_image_tools
-- 
2.24.1

[PATCH 2/2] meta: image-account-extension: trigger a rebuild when variables change

[Henning Schild]

From: Henning Schild <henning.schild@siemens.com>

This makes sure we rebuild if the user/group information changes.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/image-account-extension.bbclass | 2 ++
 meta/classes/rootfs.bbclass                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass
index 22754da..70c2bfa 100644
--- a/meta/classes/image-account-extension.bbclass
+++ b/meta/classes/image-account-extension.bbclass
@@ -56,6 +56,8 @@ IMAGE_ACCOUNTS_USERS =+ "${@gen_accounts_array(d, 'USERS', 'USER', ['password',
 # groupname:groupid:flag1,flag2
 IMAGE_ACCOUNTS_GROUPS =+ "${@gen_accounts_array(d, 'GROUPS', 'GROUP', ['gid', 'flags'])}"
 
+do_rootfs_install[vardeps] += "${IMAGE_ACCOUNTS_GROUPS} ${IMAGE_ACCOUNTS_USERS}"
+
 ROOTFS_CONFIGURE_COMMAND += "image_configure_accounts"
 image_configure_accounts[weight] = "3"
 image_configure_accounts() {
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index b4dbfa3..64eaef7 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -137,7 +137,7 @@ rootfs_install_pkgs_install() {
 }
 
 do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}"
-do_rootfs_install[vardeps] = "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}"
+do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}"
 do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build isar-apt:do_cache_config"
 do_rootfs_install[deptask] = "do_deploy_deb"
 python do_rootfs_install() {
-- 
2.24.1

Re: [PATCH 1/2] meta: targz-img: chown image file to building user

[Henning Schild]

https://github.com/henning-schild-work/isar/tree/henning/staging6

On Wed, 18 Dec 2019 16:19:02 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> Make sure the image is not owned by root:root.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/targz-img.bbclass | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes/targz-img.bbclass
> b/meta/classes/targz-img.bbclass index d9dadae..af12ae1 100644
> --- a/meta/classes/targz-img.bbclass
> +++ b/meta/classes/targz-img.bbclass
> @@ -8,6 +8,7 @@ TARGZ_IMAGE_FILE =
> "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz" do_targz_image() {
>      rm -f ${TARGZ_IMAGE_FILE}
>      sudo tar -cvzf ${TARGZ_IMAGE_FILE} --one-file-system -C
> ${IMAGE_ROOTFS} .
> +    sudo chown $(id -u):$(id -g) ${TARGZ_IMAGE_FILE}
>  }
>  
>  addtask targz_image before do_image after do_image_tools

Re: [PATCH 1/2] meta: targz-img: chown image file to building user

[Baurzhan Ismagulov]

On Wed, Dec 18, 2019 at 04:19:02PM +0100, Henning Schild wrote:
> Make sure the image is not owned by root:root.

Thanks, applied to next.

With kind regards,
Baurzhan.