On Sat, Jul 07, 2018 at 03:22:36AM -0400, [email protected] wrote:
> From: Jon Ringle <[email protected]>
>
> Signed-off-by: Jon Ringle <[email protected]>
Please document this in the image package section in doc/ref_manual.rst.
> ---
> platforms/image-root-tgz.in | 11 +++++++++++
> rules/image-root-tgz.make | 1 +
> rules/post/ptxd_make_image_common.make | 3 ++-
> scripts/lib/ptxd_make_image_archive.sh | 4 ++--
> scripts/lib/ptxd_make_image_common.sh | 2 ++
> 5 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/platforms/image-root-tgz.in b/platforms/image-root-tgz.in
> index fce1516..51246f8 100644
> --- a/platforms/image-root-tgz.in
> +++ b/platforms/image-root-tgz.in
> @@ -5,3 +5,14 @@ config IMAGE_ROOT_TGZ
> prompt "Generate images/root.tgz"
> help
> FIXME
> +
> +if IMAGE_ROOT_TGZ
add an empty line here.
> +config IMAGE_ROOT_TGZ_LABEL
> + string
> + prompt "label"
> + default
> "${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
I'm not sure such a default is a good idea. I've seen some pretty strange
vendor / project strings and I'm not sure how tar will handle those.
I think keeping the default empty is saver here. Maybe put this as an
example in the help text.
> + help
> + This string gets expanded to form the label. An empty string produces
> no label.
break.
> +
> +endif
> +
> diff --git a/rules/image-root-tgz.make b/rules/image-root-tgz.make
> index c93e8c9..07a8370 100644
> --- a/rules/image-root-tgz.make
> +++ b/rules/image-root-tgz.make
> @@ -20,6 +20,7 @@ IMAGE_ROOT_TGZ := image-root-tgz
> IMAGE_ROOT_TGZ_DIR := $(BUILDDIR)/$(IMAGE_ROOT_TGZ)
> IMAGE_ROOT_TGZ_IMAGE := $(IMAGEDIR)/root.tgz
> IMAGE_ROOT_TGZ_PKGS = $(PTX_PACKAGES_INSTALL)
> +IMAGE_ROOT_TGZ_LABEL := $(call remove_quotes,
> $(PTXCONF_IMAGE_ROOT_TGZ_LABEL))
>
> #
> ----------------------------------------------------------------------------
> # Image
> diff --git a/rules/post/ptxd_make_image_common.make
> b/rules/post/ptxd_make_image_common.make
> index a1a5e78..8aa8c0a 100644
> --- a/rules/post/ptxd_make_image_common.make
> +++ b/rules/post/ptxd_make_image_common.make
> @@ -21,7 +21,8 @@ world/image/env/impl = \
> image_env="$(call ptx/escape,$($(1)_ENV))" \
> image_pkgs="$(call ptx/escape,$($(1)_PKGS))" \
> image_files="$(call ptx/escape,$($(1)_FILES))" \
> - image_image="$(call ptx/escape,$($(1)_IMAGE))"
> + image_image="$(call ptx/escape,$($(1)_IMAGE))" \
> + image_label="$(call ptx/escape,$($(1)_LABEL))"
>
> world/image/env = \
> $(call world/image/env/impl,$(strip $(1)))
> diff --git a/scripts/lib/ptxd_make_image_archive.sh
> b/scripts/lib/ptxd_make_image_archive.sh
> index 650679a..bb43fa2 100644
> --- a/scripts/lib/ptxd_make_image_archive.sh
> +++ b/scripts/lib/ptxd_make_image_archive.sh
> @@ -16,8 +16,8 @@ ptxd_make_image_archive_impl() {
> ptxd_get_ipkg_files ${image_pkgs} &&
> ptxd_make_image_extract_xpkg_files "${pkg_dir}" &&
> cd "${pkg_dir}" &&
> - echo -e "\nCreating $(ptxd_print_path "${image_image}") ...\n" &&
> - tar -zcf "${image_image}" . &&
> + echo -e "\nCreating $(ptxd_print_path "${image_image}") $([ -n
> "${image_label}" ] && echo "with label \"${image_label}\" ")...\n" &&
just use multiple echos with '-n' and a normal 'if ...'
> + tar ${image_label_args} -zcf "${image_image}" . &&
> rm -r "${pkg_dir}"
> }
> export -f ptxd_make_image_archive_impl
> diff --git a/scripts/lib/ptxd_make_image_common.sh
> b/scripts/lib/ptxd_make_image_common.sh
> index 402ff53..4fc8c50 100644
> --- a/scripts/lib/ptxd_make_image_common.sh
> +++ b/scripts/lib/ptxd_make_image_common.sh
> @@ -66,6 +66,8 @@ ptxd_make_image_init() {
> image_ipkg_repo_dirs=( "${image_repo_dist_dir}" )
> fi
>
> + [ -n "${image_label}" ] && image_label_args="--label \"${image_label}\""
if [ -n "${image_label}" ]; then
...
and always set the variable to something.
Michael
> +
> exec 2>&${PTXDIST_FD_LOGERR}
> }
> export -f ptxd_make_image_init
> --
> 1.9.1
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]