[PATCH] meta: Add targz image class

[PATCH] meta: Add targz image class

[Harald Seiler]

Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/classes/targz-img.bbclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 meta/classes/targz-img.bbclass

diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
new file mode 100644
index 0000000..898c2a8
--- /dev/null
+++ b/meta/classes/targz-img.bbclass
@@ -0,0 +1,12 @@
+# This software is a part of ISAR.
+
+TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
+
+do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
+
+do_targz_image() {
+    rm -f ${TARGZ_IMAGE_FILE}
+    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
+}
+
+addtask targz_image before do_build after do_copy_boot_files
-- 
2.14.1

Re: [PATCH] meta: Add targz image class

[Jan Kiszka]

On 20.11.18 12:50, Harald Seiler wrote:
> Signed-off-by: Harald Seiler <hws@denx.de>
> ---
>   meta/classes/targz-img.bbclass | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>   create mode 100644 meta/classes/targz-img.bbclass
> 
> diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
> new file mode 100644
> index 0000000..898c2a8
> --- /dev/null
> +++ b/meta/classes/targz-img.bbclass
> @@ -0,0 +1,12 @@
> +# This software is a part of ISAR.

Missing copyright and license statement. That should be something like

# This software is a part of ISAR.
# Copyright (c) Siemens AG, 2018
#
# SPDX-License-Identifier: MIT

("Siemens" if this was part of our contract work)

> +
> +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> +
> +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_targz_image() {
> +    rm -f ${TARGZ_IMAGE_FILE}
> +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .

We need sudo in order to see files that are root-visible only, right?

> +}
> +
> +addtask targz_image before do_build after do_copy_boot_files
> 

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] meta: Add targz image class

[Henning Schild]

Am Tue, 20 Nov 2018 12:50:24 +0100
schrieb Harald Seiler <hws@denx.de>:

> Signed-off-by: Harald Seiler <hws@denx.de>
> ---
>  meta/classes/targz-img.bbclass | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>  create mode 100644 meta/classes/targz-img.bbclass
> 
> diff --git a/meta/classes/targz-img.bbclass
> b/meta/classes/targz-img.bbclass new file mode 100644
> index 0000000..898c2a8
> --- /dev/null
> +++ b/meta/classes/targz-img.bbclass
> @@ -0,0 +1,12 @@
> +# This software is a part of ISAR.
> +
> +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> +
> +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_targz_image() {
> +    rm -f ${TARGZ_IMAGE_FILE}

Can be skipped, probably fails anyways.

> +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
> +}
> +
> +addtask targz_image before do_build after do_copy_boot_files

"after do_rootfs" in fact we do not need the copy for that one

How will we test that?

Henning

Re: [PATCH] meta: Add targz image class

[Harald Seiler]

On Tue, 2018-11-20 at 13:51 +0100, Henning Schild wrote:
> Am Tue, 20 Nov 2018 12:50:24 +0100
> schrieb Harald Seiler <hws@denx.de>:
> 
> > Signed-off-by: Harald Seiler <hws@denx.de>
> > ---
> >  meta/classes/targz-img.bbclass | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> >  create mode 100644 meta/classes/targz-img.bbclass
> > 
> > diff --git a/meta/classes/targz-img.bbclass
> > b/meta/classes/targz-img.bbclass new file mode 100644
> > index 0000000..898c2a8
> > --- /dev/null
> > +++ b/meta/classes/targz-img.bbclass
> > @@ -0,0 +1,12 @@
> > +# This software is a part of ISAR.
> > +
> > +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> > +
> > +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> > +
> > +do_targz_image() {
> > +    rm -f ${TARGZ_IMAGE_FILE}
> 
> Can be skipped, probably fails anyways.

It seems to be necessary.  While testing, tar did not overwrite
the archive during a rebuild.

> 
> > +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
> > +}
> > +
> > +addtask targz_image before do_build after do_copy_boot_files
> 
> "after do_rootfs" in fact we do not need the copy for that one

Ok, makes sense ...

> How will we test that?

The final tar could be checked agains the rootfs tree generated
during the build using:

	tar --compare --file=archive-file.tar -C /some/where/

I am not sure if this is worth it though, as this will always work
unless tar itself made a mistake ... I think the recipe is trivial
enough that this check can be omitted.

-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws@denx.de 

Re: [PATCH] meta: Add targz image class

[chombourger]

[-- Attachment #1.1: Type: text/plain, Size: 564 bytes --]



On Tuesday, November 20, 2018 at 2:07:35 PM UTC+1, Harald Seiler wrote:
>
> > How will we test that? 
>
> The final tar could be checked agains the rootfs tree generated 
> during the build using: 
>
>         tar --compare --file=archive-file.tar -C /some/where/ 
>
> I am not sure if this is worth it though, as this will always work 
> unless tar itself made a mistake ... I think the recipe is trivial 
> enough that this check can be omitted. 
>
>
I wonder if Jan was instead asking how would be have this feature tested? 
possibly from a CI perspective?
 

[-- Attachment #1.2: Type: text/html, Size: 789 bytes --]

[PATCH v2] meta: Add targz image class

[Harald Seiler]

Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/classes/targz-img.bbclass | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta/classes/targz-img.bbclass

diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
new file mode 100644
index 0000000..cce8ded
--- /dev/null
+++ b/meta/classes/targz-img.bbclass
@@ -0,0 +1,15 @@
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
+
+do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
+
+do_targz_image() {
+    rm -f ${TARGZ_IMAGE_FILE}
+    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
+}
+
+addtask targz_image before do_build after do_rootfs

-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws@denx.de 

Re: [PATCH v2] meta: Add targz image class

[Maxim Yu. Osipov]

Hi Harald,

Could you please answer to Cedric's email (see below)?

Kind regards,
Maxim.

On 11/20/18 4:14 PM, chombourger@gmail.com wrote:>
 >
 > On Tuesday, November 20, 2018 at 2:07:35 PM UTC+1, Harald Seiler wrote:
 >
 >      > How will we test that?
 >
 >     The final tar could be checked agains the rootfs tree generated
 >     during the build using:
 >
 >              tar --compare --file=archive-file.tar -C /some/where/
 >
 >     I am not sure if this is worth it though, as this will always work
 >     unless tar itself made a mistake ... I think the recipe is trivial
 >     enough that this check can be omitted.
 >
 >
 > I wonder if Jan was instead asking how would be have this feature
 > tested? possibly from a CI perspective?
 >



On 11/20/18 4:19 PM, Harald Seiler wrote:
> Signed-off-by: Harald Seiler <hws@denx.de>
> ---
>   meta/classes/targz-img.bbclass | 15 +++++++++++++++
>   1 file changed, 15 insertions(+)
>   create mode 100644 meta/classes/targz-img.bbclass
> 
> diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
> new file mode 100644
> index 0000000..cce8ded
> --- /dev/null
> +++ b/meta/classes/targz-img.bbclass
> @@ -0,0 +1,15 @@
> +# This software is a part of ISAR.
> +# Copyright (c) Siemens AG, 2018
> +#
> +# SPDX-License-Identifier: MIT
> +
> +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> +
> +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_targz_image() {
> +    rm -f ${TARGZ_IMAGE_FILE}
> +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
> +}
> +
> +addtask targz_image before do_build after do_rootfs
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

Re: [PATCH v2] meta: Add targz image class

[Harald Seiler]

Hello Maxim,

On Fri, 2018-11-23 at 10:32 +0300, Maxim Yu. Osipov wrote:
> Hi Harald,
> 
> Could you please answer to Cedric's email (see below)?

It didn't show up in my mail client for some reason, sorry ...

> Kind regards,
> Maxim.
> 
> On 11/20/18 4:14 PM, chombourger@gmail.com wrote:>
> >
> > On Tuesday, November 20, 2018 at 2:07:35 PM UTC+1, Harald Seiler wrote:
> >
> >      > How will we test that?
> >
> >     The final tar could be checked agains the rootfs tree generated
> >     during the build using:
> >
> >              tar --compare --file=archive-file.tar -C /some/where/
> >
> >     I am not sure if this is worth it though, as this will always work
> >     unless tar itself made a mistake ... I think the recipe is trivial
> >     enough that this check can be omitted.
> >
> >
> > I wonder if Jan was instead asking how would be have this feature
> > tested? possibly from a CI perspective?
> >
> 

That is what I was referring to ... I don't see much to be tested except
having one ci target build an image with this class and the compare test.

I think we would need to add a new multiconf target for this?

> 
> On 11/20/18 4:19 PM, Harald Seiler wrote:
> > Signed-off-by: Harald Seiler <hws@denx.de>
> > ---
> >   meta/classes/targz-img.bbclass | 15 +++++++++++++++
> >   1 file changed, 15 insertions(+)
> >   create mode 100644 meta/classes/targz-img.bbclass
> > 
> > diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
> > new file mode 100644
> > index 0000000..cce8ded
> > --- /dev/null
> > +++ b/meta/classes/targz-img.bbclass
> > @@ -0,0 +1,15 @@
> > +# This software is a part of ISAR.
> > +# Copyright (c) Siemens AG, 2018
> > +#
> > +# SPDX-License-Identifier: MIT
> > +
> > +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> > +
> > +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> > +
> > +do_targz_image() {
> > +    rm -f ${TARGZ_IMAGE_FILE}
> > +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
> > +}
> > +
> > +addtask targz_image before do_build after do_rootfs
> > 
> 

-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws@denx.de

Re: [PATCH v2] meta: Add targz image class

[Cedric Hombourger]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]


> 
> That is what I was referring to ... I don't see much to be tested except
> having one ci target build an image with this class and the compare test.
> 
> I think we would need to add a new multiconf target for this?
> 

That sounds reasonable to me!

Cedric

[-- Attachment #2: Type: text/html, Size: 3788 bytes --]

[PATCH v3] meta: Add targz image class

[Harald Seiler]

This commit adds a new image class: targz-img

This image type is intended to be used when deploying
using nfs.  Also adds a new ci target: qemuamd64-buster-tgz
to ensure building a targz image works.

Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/classes/targz-img.bbclass                       | 15 +++++++++++++++
 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 15 +++++++++++++++
 meta-isar/conf/local.conf.sample                     |  1 +
 scripts/ci_build.sh                                  |  1 +
 4 files changed, 32 insertions(+)
 create mode 100644 meta/classes/targz-img.bbclass
 create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf

diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
new file mode 100644
index 0000000..ef3748e
--- /dev/null
+++ b/meta/classes/targz-img.bbclass
@@ -0,0 +1,15 @@
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
+
+do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
+
+do_targz_image() {
+    rm -f ${TARGZ_IMAGE_FILE}
+    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
+}
+
+addtask targz_image before do_build after do_mark_rootfs
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
new file mode 100644
index 0000000..1894454
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
@@ -0,0 +1,15 @@
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "qemuamd64"
+
+DISTRO ?= "debian-buster"
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_TYPE ?= "targz-img"
+
+IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 4a60068..fe81f20 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -52,6 +52,7 @@ BBMULTICONFIG = " \
     de0-nano-soc-stretch \
     hikey-stretch \
     qemuamd64-buster \
+    qemuamd64-buster-tgz \
     rpi-jessie \
 "
 
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 059df21..8f03935 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -104,6 +104,7 @@ else
         multiconfig:qemuamd64-jessie:isar-image-base \
         multiconfig:qemuamd64-stretch:isar-image-base \
         multiconfig:qemuamd64-buster:isar-image-base \
+        multiconfig:qemuamd64-buster-tgz:isar-image-base \
         multiconfig:rpi-jessie:isar-image-base
     # qemu-user-static of <= buster too old to build that
     #multiconfig:qemuarm64-buster:isar-image-base

-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws@denx.de 

Re: [PATCH v3] meta: Add targz image class

[Maxim Yu. Osipov]

On 11/27/18 12:13 PM, Harald Seiler wrote:
> This commit adds a new image class: targz-img
> 
> This image type is intended to be used when deploying
> using nfs.  Also adds a new ci target: qemuamd64-buster-tgz
> to ensure building a targz image works.

Applied to the 'next'.

Sorry for the delay - build in 'next' had to be repaired first.

Thanks,
Maxim.

> Signed-off-by: Harald Seiler <hws@denx.de>
> ---
>   meta/classes/targz-img.bbclass                       | 15 +++++++++++++++
>   meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 15 +++++++++++++++
>   meta-isar/conf/local.conf.sample                     |  1 +
>   scripts/ci_build.sh                                  |  1 +
>   4 files changed, 32 insertions(+)
>   create mode 100644 meta/classes/targz-img.bbclass
>   create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> 
> diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass
> new file mode 100644
> index 0000000..ef3748e
> --- /dev/null
> +++ b/meta/classes/targz-img.bbclass
> @@ -0,0 +1,15 @@
> +# This software is a part of ISAR.
> +# Copyright (c) Siemens AG, 2018
> +#
> +# SPDX-License-Identifier: MIT
> +
> +TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz"
> +
> +do_targz_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
> +
> +do_targz_image() {
> +    rm -f ${TARGZ_IMAGE_FILE}
> +    sudo tar -cvzf ${TARGZ_IMAGE_FILE} -C ${IMAGE_ROOTFS} .
> +}
> +
> +addtask targz_image before do_build after do_mark_rootfs
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> new file mode 100644
> index 0000000..1894454
> --- /dev/null
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> @@ -0,0 +1,15 @@
> +# This software is a part of ISAR.
> +# Copyright (c) Siemens AG, 2018
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE ?= "qemuamd64"
> +
> +DISTRO ?= "debian-buster"
> +DISTRO_ARCH ?= "amd64"
> +
> +KERNEL_NAME ?= "amd64"
> +
> +IMAGE_TYPE ?= "targz-img"
> +
> +IMAGE_INSTALL += "sshd-regen-keys"
> diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
> index 4a60068..fe81f20 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -52,6 +52,7 @@ BBMULTICONFIG = " \
>       de0-nano-soc-stretch \
>       hikey-stretch \
>       qemuamd64-buster \
> +    qemuamd64-buster-tgz \
>       rpi-jessie \
>   "
>   
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index 059df21..8f03935 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -104,6 +104,7 @@ else
>           multiconfig:qemuamd64-jessie:isar-image-base \
>           multiconfig:qemuamd64-stretch:isar-image-base \
>           multiconfig:qemuamd64-buster:isar-image-base \
> +        multiconfig:qemuamd64-buster-tgz:isar-image-base \
>           multiconfig:rpi-jessie:isar-image-base
>       # qemu-user-static of <= buster too old to build that
>       #multiconfig:qemuarm64-buster:isar-image-base
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov