Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

[Ladislav Michl]

On Mon, Aug 15, 2016 at 04:54:47PM +0200, Michael Olbrich wrote:
> On Mon, Aug 15, 2016 at 04:10:58PM +0200, Ladislav Michl wrote:
> > Just tested, error path triggered, but 'ptxdist clean root' didn't help.
> > I had to delete *.perms files manually. Is it worth better fix or is it
> > enough just change error message?
> 
> Can you try to reproduce this? Clean root should trigger targetinstall for
> all packages and new permission files should be created. For which image
> did it fail?

I built DistroKit with 2016.07 and then switched to git version. Will try to
reproduce after update to Qt-5.7.0 gets more testing.

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

[Michael Olbrich]

On Mon, Aug 15, 2016 at 04:10:58PM +0200, Ladislav Michl wrote:
> On Thu, Aug 04, 2016 at 08:51:39AM +0200, Michael Olbrich wrote:
> > I'm already testing it. Looks good so far. I just need to setup a test-case
> > to trigger the error path before I push it.
> 
> Just tested, error path triggered, but 'ptxdist clean root' didn't help.
> I had to delete *.perms files manually. Is it worth better fix or is it
> enough just change error message?

Can you try to reproduce this? Clean root should trigger targetinstall for
all packages and new permission files should be created. For which image
did it fail?

Michael

-- 
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- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

[Ladislav Michl]

On Thu, Aug 04, 2016 at 08:51:39AM +0200, Michael Olbrich wrote:
> I'm already testing it. Looks good so far. I just need to setup a test-case
> to trigger the error path before I push it.

Just tested, error path triggered, but 'ptxdist clean root' didn't help.
I had to delete *.perms files manually. Is it worth better fix or is it
enough just change error message?

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

[Ladislav Michl]

On Sun, Jul 31, 2016 at 11:10:37PM +0200, Ladislav Michl wrote:
> Change separator to allow ':' in filenames.

As 2016.08 should be released this month and this patch needs carefull
review and testing, I'm gently pinging anyone responsible...

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] use ^_ as separator in perms files

[Ladislav Michl]

Change separator to allow ':' in filenames.

Signed-off-by: Ladislav Michl 
---
 Changes since v1:
  - bail out when old perm file format is found
(Note that if packets are pulled from ipkg repository, running
 'ptxdist clean root' will not help)

 rules/post/image_cpio.make |  2 +-
 rules/post/image_ext2.make |  2 +-
 rules/post/image_jffs2.make|  2 +-
 rules/post/image_squashfs.make |  2 +-
 rules/post/image_tgz.make  |  6 +++---
 rules/post/image_ubi.make  |  2 +-
 rules/post/ptxd_make_image_common.make |  2 +-
 scripts/lib/ptxd_lib_dopermissions.awk |  2 +-
 scripts/lib/ptxd_make_image_fix_permissions.sh |  6 --
 scripts/lib/ptxd_make_xpkg_common.sh   |  1 +
 scripts/lib/ptxd_make_xpkg_pkg.sh  |  9 ++---
 scripts/libptxdist.sh  | 11 +++
 12 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/rules/post/image_cpio.make b/rules/post/image_cpio.make
index 573faee..200b283 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 3e3423b..0dbcafd 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 5e448f5..7f12883 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 6d02255..69dc721 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 57f69f4..bace4da 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."