Re: [ptxdist] [PATCH v3] image_tgz: Make label optional

[Jon Ringle <jon@ringle.org>]

ping...

On Thu, Apr 17, 2014 at 11:11 AM,  <jon@ringle.org> wrote:
> From: Jon Ringle <jringle@gridpoint.com>
>
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
>  platforms/image_tgz.in    | 23 +++++++++++++++++++++--
>  rules/post/image_tgz.make |  8 ++++++--
>  2 files changed, 27 insertions(+), 4 deletions(-)
>
> diff --git a/platforms/image_tgz.in b/platforms/image_tgz.in
> index 17b0aed..c583bbc 100644
> --- a/platforms/image_tgz.in
> +++ b/platforms/image_tgz.in
> @@ -1,8 +1,27 @@
>  ## SECTION=image
>
> -config IMAGE_TGZ
> +menuconfig IMAGE_TGZ
>         bool
> -       prompt "Generate images/root.tgz"
> +       prompt "Generate images/root.tgz      "
>         help
>           Build a tar.gz archive of the root filesystem, containing the
>           right owner/group and access permissions.
> +
> +if IMAGE_TGZ
> +
> +config IMAGE_TGZ_INCLUDE_LABEL
> +       bool
> +       prompt "Include label"
> +       help
> +         Create tgz image with a label
> +
> +if IMAGE_TGZ_INCLUDE_LABEL
> +config IMAGE_TGZ_LABEL
> +       string
> +       prompt "label"
> +       default "${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
> +       help
> +         This string gets expanded to form the label. An empty string produces no label.
> +
> +endif
> +endif
> diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make
> index 019077d..6211822 100644
> --- a/rules/post/image_tgz.make
> +++ b/rules/post/image_tgz.make
> @@ -10,12 +10,16 @@
>
>  SEL_ROOTFS-$(PTXCONF_IMAGE_TGZ)                += $(IMAGEDIR)/root.tgz
>
> +ifdef PTXCONF_IMAGE_TGZ_LABEL
> +IMAGE_TGZ_LABEL="--label $(PTXCONF_IMAGE_TGZ_LABEL)"
> +endif
> +
>  ifdef PTXCONF_IMAGE_TGZ
>  $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir
> -       @echo -n "Creating root.tgz from working dir with label..."
> +       @echo -n "Creating root.tgz from working dir: ${IMAGE_TGZ_LABEL} "
>         @cd $(image/work_dir);                                                  \
>         (awk -F: $(DOPERMISSIONS) $(image/permissions) &&               \
> -       (       echo -n "tar --label '${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}' -zcf ";   \
> +       (       echo -n "tar ${IMAGE_TGZ_LABEL} -zcf "; \
>                 echo -n "$@ ." )                                        \
>         ) | $(FAKEROOT) --
>         @echo "done."
> --
> 1.8.5.4
>

-- 
ptxdist mailing list
ptxdist@pengutronix.de