| Message ID | 20210205105235.29169-3-Quirin.Gylstorff@siemens.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | CPIO & OVA Images | expand |
On 05.02.21 11:52, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > to create a initramfs like filesystem. > > Signed-off-by: Michael Adler <michael.adler@siemens.com> This is a bit unbalanced as I just realized. Was Michael the author of this patch? Or did you only base your version on his? In the former case, From: should be adjusted. In the latter case, just state "Based on original patch by...". > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 +++++++++ > meta/classes/cpiogz-img.bbclass | 20 +++++++++++++++++++ > scripts/ci_build.sh | 2 ++ > 3 files changed, 31 insertions(+) > create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf > create mode 100644 meta/classes/cpiogz-img.bbclass > > diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf > new file mode 100644 > index 0000000..cadcdac > --- /dev/null > +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf > @@ -0,0 +1,9 @@ > +# This software is a part of ISAR. > +# Copyright (c) Siemens AG, 2020 > +# > +# SPDX-License-Identifier: MIT > + > +MACHINE ?= "qemuamd64" > +DISTRO ?= "debian-buster" > + > +IMAGE_TYPE = "cpiogz-img" > diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass > new file mode 100644 > index 0000000..8efdcb4 > --- /dev/null > +++ b/meta/classes/cpiogz-img.bbclass > @@ -0,0 +1,20 @@ > +# This software is a part of ISAR. > +# Copyright (C) 2020 Siemens AG > +# > +# SPDX-License-Identifier: MIT > + > +CPIOGZ_FNAME ?= "${IMAGE_FULLNAME}.cpio.gz" > +CPIOGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${CPIOGZ_FNAME}" > +IMAGER_INSTALL += "cpio" > +CPIO_IMAGE_FORMAT ?= "newc" > +do_cpiogz_image() { > + sudo rm -f ${CPIOGZ_IMAGE_FILE} > + image_do_mounts > + sudo chroot ${BUILDCHROOT_DIR} \ > + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ > + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o | /usr/bin/gzip -9 > \ > + ${PP_DEPLOY}/${CPIOGZ_FNAME}" > + sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} > +} > + > +addtask cpiogz_image before do_image after do_image_tools > diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh > index 005bda5..83461e5 100755 > --- a/scripts/ci_build.sh > +++ b/scripts/ci_build.sh > @@ -28,6 +28,8 @@ TARGETS_SET="\ > mc:qemuamd64-stretch:isar-image-base \ > mc:qemuamd64-buster:isar-image-base \ > mc:qemuamd64-buster-tgz:isar-image-base \ > + mc:qemuamd64-buster-cpiogz:isar-image-base \ > + mc:qemuamd64-bullseye:isar-image-base \ > mc:qemumipsel-stretch:isar-image-base \ > mc:qemumipsel-buster:isar-image-base \ > mc:nand-ubi-demo-buster:isar-image-ubi \ >
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf new file mode 100644 index 0000000..cadcdac --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "debian-buster" + +IMAGE_TYPE = "cpiogz-img" diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass new file mode 100644 index 0000000..8efdcb4 --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,20 @@ +# This software is a part of ISAR. +# Copyright (C) 2020 Siemens AG +# +# SPDX-License-Identifier: MIT + +CPIOGZ_FNAME ?= "${IMAGE_FULLNAME}.cpio.gz" +CPIOGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${CPIOGZ_FNAME}" +IMAGER_INSTALL += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" +do_cpiogz_image() { + sudo rm -f ${CPIOGZ_IMAGE_FILE} + image_do_mounts + sudo chroot ${BUILDCHROOT_DIR} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o | /usr/bin/gzip -9 > \ + ${PP_DEPLOY}/${CPIOGZ_FNAME}" + sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} +} + +addtask cpiogz_image before do_image after do_image_tools diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 005bda5..83461e5 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -28,6 +28,8 @@ TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:qemuamd64-buster:isar-image-base \ mc:qemuamd64-buster-tgz:isar-image-base \ + mc:qemuamd64-buster-cpiogz:isar-image-base \ + mc:qemuamd64-bullseye:isar-image-base \ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \