From f94a44c3ad06ae6bab203a3dda314b9ed98785e0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 20 Mar 2007 16:52:44 +0000 Subject: - use numeric values for the superuser to be more portable. Closes #1250 --- target/cpio/cpioroot.mk | 2 +- target/cramfs/cramfs.mk | 2 +- target/ext2/Config.in | 2 +- target/ext2/ext2root.mk | 2 +- target/iso9660/iso9660.mk | 2 +- target/jffs2/jffs2root.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- target/tar/tarroot.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 6cff4dde6..1a69b5002 100644 --- 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 0f488e143..54a0fa845 100644 --- 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 8d733e5ef..b84ead3cd 100644 --- 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 69aa871e2..600cf134b 100644 --- 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 b53666047..69ab03de4 100644 --- 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 c00cace27..2b9c0f85a 100644 --- 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 0ec6f85d2..515153a0a 100644 --- 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 19aff6109..b1dd0b4b2 100644 --- 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)" \ -- cgit v1.2.3