Thanks, applied as 2b511c4bc2cb9d0b265c7aab770d2abfe34e07db. Michael
[sent from post-receive hook] On Mon, 28 Feb 2022 13:09:12 +0100, Christian Melki <[email protected]> wrote: > * Clean cpio generation, drop separate in and make for gz. > * Extend image-root-cpio.in with compression methods > (raw, gz, zstd, xz, lzop). > * Compression mode selects compression utility. > * Filename suffix depends on compression mode. > * Platform migration from PTXCONF_IMAGE_ROOT_CPIO_GZ to > PTXCONF_IMAGE_ROOT_CPIO and PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ > * Extend help. Explain that compression for integrated cpios > in kernel blob are compressed by the kernel build system. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/platforms/image-root-cpio-gz.in b/platforms/image-root-cpio-gz.in > deleted file mode 100644 > index e1feb5f9b9c4..000000000000 > --- a/platforms/image-root-cpio-gz.in > +++ /dev/null > @@ -1,10 +0,0 @@ > -## SECTION=image > - > -config IMAGE_ROOT_CPIO_GZ > - tristate > - select HOST_GENIMAGE > - select IMAGE_ROOT_TGZ > - prompt "Generate images/root.cpio.gz" > - help > - Build the traditionally initrd RAM disk to be used > - as initramfs by the kernel. > diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in > index f5ee4c1d8d4c..d3090dc298e9 100644 > --- a/platforms/image-root-cpio.in > +++ b/platforms/image-root-cpio.in > @@ -1,10 +1,73 @@ > ## SECTION=image > > -config IMAGE_ROOT_CPIO > +menuconfig IMAGE_ROOT_CPIO > tristate > select HOST_GENIMAGE > select IMAGE_ROOT_TGZ > - prompt "Generate images/root.cpio" > + select HOST_ZSTD if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD > + select HOST_XZ if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ > + select HOST_LZOP if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP > + prompt "Generate images/root.cpio " > help > - Build the traditionally initrd RAM disk to be used > - as initramfs by the kernel. > + Build the traditional rootfs to be used as initramfs > + by the kernel. > + The compression choices are for external initramfs use. > + When including a cpio archive inside the kernel blob, > + the kernel build system can manage compressing the cpio > + archive itself. > + > +if IMAGE_ROOT_CPIO > + > +choice > + prompt "CPIO compression mode" > + default IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE > + > +config IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE > + bool > + prompt "no compression" > + help > + No compression. > + > +config IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ > + bool > + prompt "gz" > + help > + Compress root.cpio with gz > + > +config IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD > + bool > + prompt "zstd" > + help > + Compress root.cpio with zstd > + > +config IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ > + bool > + prompt "xz" > + help > + Compress root.cpio with xz > + > +config IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP > + bool > + prompt "lzop" > + help > + Compress root.cpio with lzop > + > +endchoice > + > +config IMAGE_ROOT_CPIO_COMPRESSION_SUFFIX > + string > + default "" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE > + default ".gz" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ > + default ".zst" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD > + default ".xz" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ > + default ".lzo" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP > + > +config IMAGE_ROOT_CPIO_COMPRESSION_UTIL > + string > + default "" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_NONE > + default "gzip" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ > + default "zstd" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_ZSTD > + default "xz" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_XZ > + default "lzop" if IMAGE_ROOT_CPIO_COMPRESSION_MODE_LZOP > + > +endif > diff --git a/rules/image-root-cpio-gz.make b/rules/image-root-cpio-gz.make > deleted file mode 100644 > index 52a6a4bd9e93..000000000000 > --- a/rules/image-root-cpio-gz.make > +++ /dev/null > @@ -1,38 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2012 by Michael Olbrich <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO_GZ) += image-root-cpio-gz > - > -# > -# Paths and names > -# > -IMAGE_ROOT_CPIO_GZ := image-root-cpio-gz > -IMAGE_ROOT_CPIO_GZ_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO_GZ) > -IMAGE_ROOT_CPIO_GZ_IMAGE := $(IMAGEDIR)/root.cpio.gz > -IMAGE_ROOT_CPIO_GZ_FILES := $(IMAGEDIR)/root.tgz > -IMAGE_ROOT_CPIO_GZ_CONFIG := cpio.config > - > -# > ---------------------------------------------------------------------------- > -# Image > -# > ---------------------------------------------------------------------------- > - > -IMAGE_ROOT_CPIO_GZ_ENV := \ > - FORMAT="newc" \ > - COMPRESS=gzip > - > -ifdef PTXCONF_IMAGE_ROOT_CPIO_GZ > -$(IMAGE_ROOT_CPIO_GZ_IMAGE): > - @$(call targetinfo) > - @$(call image/genimage, IMAGE_ROOT_CPIO_GZ) > - @$(call finish) > -endif > - > -# vim: syntax=make > diff --git a/rules/image-root-cpio.make b/rules/image-root-cpio.make > index ab6afdd42c09..fdb0ccfff1cd 100644 > --- a/rules/image-root-cpio.make > +++ b/rules/image-root-cpio.make > @@ -16,7 +16,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO) += image-root-cpio > # > IMAGE_ROOT_CPIO := image-root-cpio > IMAGE_ROOT_CPIO_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO) > -IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio > +IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio$(call remove_quotes, > $(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_SUFFIX)) > IMAGE_ROOT_CPIO_FILES := $(IMAGEDIR)/root.tgz > IMAGE_ROOT_CPIO_CONFIG := cpio.config > > @@ -26,7 +26,7 @@ IMAGE_ROOT_CPIO_CONFIG := cpio.config > > IMAGE_ROOT_CPIO_ENV := \ > FORMAT="newc" \ > - COMPRESS= > + COMPRESS=$(call remove_quotes, > $(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_UTIL)) > > ifdef PTXCONF_IMAGE_ROOT_CPIO > $(IMAGE_ROOT_CPIO_IMAGE): > diff --git a/scripts/migrate/migrate_platform > b/scripts/migrate/migrate_platform > index e9b4854d50b1..c75705f3a1cb 100755 > --- a/scripts/migrate/migrate_platform > +++ b/scripts/migrate/migrate_platform > @@ -51,3 +51,11 @@ s/^\(\(# \)\?PTXCONF_TF_A_PLATFORM\>\)\(.*$\)/\1S\3/ > # > s/^\(\(# \)\?PTXCONF\)_DTC\>\(.*$\)/\1_KERNEL_DTB\3/ > s/^\(\(# \)\?PTXCONF\)_DTC_OFTREE\(_DTS\(\|_PATH\)\)\(.*$\)/\1_KERNEL\3\5/ > + > +# > +# from : ptxdist-2022.02.0 > +# to : ptxdist-2022.03.0 > +# symbol : PTXCONF_IMAGE_ROOT_CPIO_GZ -> PTXCONF_IMAGE_ROOT_CPIO, > PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ > +# reason : root.cpio generation consolidated. gz generation now dependent on > regular cpio generation. > +# > +s/^\(\(# > \)\?PTXCONF_\)IMAGE_ROOT_CPIO_GZ\>\(.*\)$/\1IMAGE_ROOT_CPIO\3\n\1IMAGE_ROOT_CPIO_COMPRESSION_MODE_GZ\3/ _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
