From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 27 Nov 2012 18:42:45 +0000 (+0000)
Subject: image.mk: don't squash file permissions in JFFS2 images
X-Git-Tag: reboot~12174
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7196f5d7c8ec0de8ae06cf664adbf8cdda2c594d;p=oweals%2Fopenwrt.git

image.mk: don't squash file permissions in JFFS2 images

Currently we call mkfs.jffs2 --squash, which will change
both file permissions and owners.

If we have some file with suid bits, it will clear these bits.

Thus it's enough to just squash file owners, by replacing that
argument to --squash-uids.

Signed-off-by: Jonh Wendell <jonh.wendell@oiwifi.com.br>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34397
---

diff --git a/include/image.mk b/include/image.mk
index 1977fc84c0..10850a6327 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -18,9 +18,9 @@ KDIR=$(KERNEL_BUILD_DIR)
 IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 
 ifneq ($(CONFIG_BIG_ENDIAN),)
-  JFFS2OPTS     :=  --pad --big-endian --squash -v
+  JFFS2OPTS     :=  --pad --big-endian --squash-uids -v
 else
-  JFFS2OPTS     :=  --pad --little-endian --squash -v
+  JFFS2OPTS     :=  --pad --little-endian --squash-uids -v
 endif
 
 ifeq ($(CONFIG_JFFS2_RTIME),y)