- use numeric values for the superuser to be more portable.

  Closes #1250

diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 6cff4dde6294c2423f63ccd1ccc46ee7f6921228..1a69b5002d28207835f9fd815a36dd38825f5e64 100644 (file)
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -19,7 +19,7 @@ cpioroot: host-fakeroot makedevs cpioroot-init
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 0f488e143067fa2cddee9159aa22a9b19d29d638..54a0fa84561a3b52cae885c9feec50c886c5a71d 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -71,7 +71,7 @@ cramfsroot: host-fakeroot makedevs cramfs
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \

diff --git a/target/ext2/Config.in b/target/ext2/Config.in
index 8d733e5ef4eb104d514c9bf6b88b0e84692d15be..b84ead3cd2343fc58a8fdce6d1a24a44e2281e07 100644 (file)
--- a/target/ext2/Config.in
+++ b/target/ext2/Config.in
@@ -15,7 +15,7 @@ config BR2_TARGET_ROOTFS_EXT2_INODES
        default 0
 
 config BR2_TARGET_ROOTFS_EXT2_RESBLKS
-       int "reserved blocks"
+       int "reserved blocks percentage"
        depends on BR2_TARGET_ROOTFS_EXT2
        default 0
 

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 69aa871e2761cc1f7e4ba08bcb61640143d1f4d1..600cf134bed7b297223d76dbbee4da4f5f5caa5e 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -96,7 +96,7 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \

diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index b536660478db8a8dcef78a4010c07e250ef5d3a0..69ab03de4234ac3834acf26d7d1c6b892eee4074 100644 (file)
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -65,7 +65,7 @@ $(ISO9660_TARGET): host-fakeroot $(EXT2_TARGET) grub mkisofs
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       echo "chown -R root:root $(ISO9660_TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
        # Use fakeroot so mkisofs believes the previous fakery
        echo "$(MKISOFS_TARGET) -R -b boot/grub/stage2_eltorito -no-emul-boot " \
                "-boot-load-size 4 -boot-info-table -o $(ISO9660_TARGET) $(ISO9660_TARGET_DIR)" \

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index c00cace27eaa3d7d3c98d31e4c5ec3886c87bc04..2b9c0f85a45827b0d7cb4271d81d93ebd4d9fe69 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -58,7 +58,7 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 0ec6f85d231d7506ab4b6eb4eafcb800ae9d8cee..515153a0a2f7f8612245c2e15af003e361524e08 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -66,7 +66,7 @@ squashfsroot: host-fakeroot makedevs squashfs
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 19aff61092000113d9352fe806f4cfb252b56f66..b1dd0b4b2d0b127c8bacff91c3a89c4b0c85e424 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -31,7 +31,7 @@ tarroot: host-fakeroot makedevs
        rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        touch $(STAGING_DIR)/.fakeroot.00000
        cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \