diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2016-07-31 23:10:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-08-12 14:46:33 +0200 |
| commit | 0d61da7cd13fa7a3c7d58f904bb9e69727d9d20c (patch) | |
| tree | 48ab6326af2f8c32f4aa4b19c1ea418e06db7da4 /rules/post | |
| parent | 8be045049cfec639e3507f53110bde88a33a4b9b (diff) | |
| download | ptxdist-0d61da7cd13fa7a3c7d58f904bb9e69727d9d20c.tar.gz ptxdist-0d61da7cd13fa7a3c7d58f904bb9e69727d9d20c.tar.xz | |
use ^_ as separator in perms files
Change separator to allow ':' in filenames.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[mol: fix old perm file detection]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/post')
| -rw-r--r-- | rules/post/image_cpio.make | 2 | ||||
| -rw-r--r-- | rules/post/image_ext2.make | 2 | ||||
| -rw-r--r-- | rules/post/image_jffs2.make | 2 | ||||
| -rw-r--r-- | rules/post/image_squashfs.make | 2 | ||||
| -rw-r--r-- | rules/post/image_tgz.make | 6 | ||||
| -rw-r--r-- | rules/post/image_ubi.make | 2 | ||||
| -rw-r--r-- | rules/post/ptxd_make_image_common.make | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/rules/post/image_cpio.make b/rules/post/image_cpio.make index 573faee91..200b283fe 100644 --- a/rules/post/image_cpio.make +++ b/rules/post/image_cpio.make @@ -15,7 +15,7 @@ $(IMAGEDIR)/root.cpio: $(STATEDIR)/image_working_dir @echo -n "Creating '$(notdir $(@))' from working dir..." @cd $(image/work_dir) && \ ( \ - awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + awk $(DOPERMISSIONS) $(image/permissions) && \ echo "find . | cpio --quiet -H newc -o > '$(@)'" \ ) | $(FAKEROOT) -- @echo "done." diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make index 3e3423b2d..0dbcafd8a 100644 --- a/rules/post/image_ext2.make +++ b/rules/post/image_ext2.make @@ -15,7 +15,7 @@ ifdef PTXCONF_IMAGE_EXT2 $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir @echo -n "Creating root.ext2 from working dir..." @cd $(image/work_dir); \ - (awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + (awk $(DOPERMISSIONS) $(image/permissions) && \ ( \ echo -n "$(PTXCONF_SYSROOT_HOST)/bin/genext2fs "; \ echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) "; \ diff --git a/rules/post/image_jffs2.make b/rules/post/image_jffs2.make index 5e448f57b..7f12883ad 100644 --- a/rules/post/image_jffs2.make +++ b/rules/post/image_jffs2.make @@ -17,7 +17,7 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir $(STATEDIR)/host-mtd-utils @echo -n "(--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) " @echo "$(call remove_quotes,$(PTXCONF_IMAGE_JFFS2_EXTRA_ARGS)))" @cd $(image/work_dir); \ - (awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + (awk $(DOPERMISSIONS) $(image/permissions) && \ ( \ echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.jffs2 "; \ echo -n "-d $(image/work_dir) "; \ diff --git a/rules/post/image_squashfs.make b/rules/post/image_squashfs.make index 6d02255c9..69dc72138 100644 --- a/rules/post/image_squashfs.make +++ b/rules/post/image_squashfs.make @@ -19,7 +19,7 @@ ifdef PTXCONF_IMAGE_SQUASHFS $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir $(STATEDIR)/host-squashfs-tools.install.post @echo -n "Creating root.squashfs from working dir..." @cd $(image/work_dir); \ - (awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + (awk $(DOPERMISSIONS) $(image/permissions) && \ ( \ echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mksquashfs "; \ echo -n "$(image/work_dir) "; \ diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make index 57f69f424..bace4daec 100644 --- a/rules/post/image_tgz.make +++ b/rules/post/image_tgz.make @@ -18,10 +18,10 @@ endif $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir @echo -n 'Creating root.tgz from working dir$(if $(IMAGE_TGZ_LABEL), with label "$(IMAGE_TGZ_LABEL)",)... ' - @cd $(image/work_dir); \ - (awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + @cd $(image/work_dir); \ + (awk $(DOPERMISSIONS) $(image/permissions) && \ ( echo -n "tar ${IMAGE_TGZ_LABEL_ARGS} -zcf "; \ - echo -n "$@ ." ) \ + echo -n "$@ ." ) \ ) | $(FAKEROOT) -- @echo "done." endif diff --git a/rules/post/image_ubi.make b/rules/post/image_ubi.make index edfae1d40..17321dc70 100644 --- a/rules/post/image_ubi.make +++ b/rules/post/image_ubi.make @@ -22,7 +22,7 @@ $(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir $(STATEDIR)/host-mtd-utils @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c $(PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT) " @echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS))" @cd $(image/work_dir); \ - (awk -F: $(DOPERMISSIONS) $(image/permissions) && \ + (awk $(DOPERMISSIONS) $(image/permissions) && \ ( \ echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.ubifs "; \ echo -n "-d $(image/work_dir) "; \ diff --git a/rules/post/ptxd_make_image_common.make b/rules/post/ptxd_make_image_common.make index 7ccb5017a..0f274bff4 100644 --- a/rules/post/ptxd_make_image_common.make +++ b/rules/post/ptxd_make_image_common.make @@ -8,7 +8,7 @@ # see the README file. # -DOPERMISSIONS := '{ \ +DOPERMISSIONS := '{ FS = "\x1F"; \ if ($$1 == "f") \ printf("chmod %s \".%s\"; chown %s.%s \".%s\";\n", $$5, $$2, $$3, $$4, $$2); \ if ($$1 == "n") \ |