diff options
| author | Jon Ringle <jringle@gridpoint.com> | 2014-04-22 12:21:59 -0400 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-04-23 08:32:18 +0200 |
| commit | 36d6ca13d5ad0b7c48c9f0ff1fe3f86a817dbba9 (patch) | |
| tree | 10da26c0a2f29b4bc1dbe0f11e576153b778d8b5 | |
| parent | d00f6ce1e06ef3b48b7ac117a2fb197fd04c9227 (diff) | |
| download | ptxdist-36d6ca13d5ad0b7c48c9f0ff1fe3f86a817dbba9.tar.gz ptxdist-36d6ca13d5ad0b7c48c9f0ff1fe3f86a817dbba9.tar.xz | |
image_tgz: Make label optional
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | platforms/image_tgz.in | 14 | ||||
| -rw-r--r-- | rules/post/image_tgz.make | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/platforms/image_tgz.in b/platforms/image_tgz.in index 17b0aed3c..8cda6f62b 100644 --- a/platforms/image_tgz.in +++ b/platforms/image_tgz.in @@ -1,8 +1,18 @@ ## 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_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 diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make index 019077ddc..bbf3edf7b 100644 --- a/rules/post/image_tgz.make +++ b/rules/post/image_tgz.make @@ -11,11 +11,15 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_TGZ) += $(IMAGEDIR)/root.tgz ifdef PTXCONF_IMAGE_TGZ +ifneq ($(call remove_quotes,$(PTXCONF_IMAGE_TGZ_LABEL)),) +IMAGE_TGZ_LABEL="--label $(PTXCONF_IMAGE_TGZ_LABEL)" +endif + $(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." |