diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-04-10 22:49:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-04-10 22:49:48 +0000 |
| commit | 674d61d84b2b754057be95038462b97ad83f759f (patch) | |
| tree | 08f19974441080147b1a2406bbe62b5847035162 /target/ext2/ext2root.mk | |
| parent | bfcb34c69f8a1e28bbd2daf3d5841350fa855f10 (diff) | |
yet again... rework fakeroot handling to ensure fakeroot is invoked just once,
as it seems to sometimes lose values logged during from earlier invocations.
Diffstat (limited to 'target/ext2/ext2root.mk')
| -rw-r--r-- | target/ext2/ext2root.mk | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 75dce4775..3d915eaa7 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -58,6 +58,7 @@ EXT2_OPTS += -r $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)) endif EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) +# " stupid syntax highlighting does not like unmatched quote from above line ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_GZ)),y) EXT2_TARGET := $(EXT2_BASE).gz @@ -75,15 +76,10 @@ $(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) - -$(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \ - chown -R root:root $(TARGET_DIR) + echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) # Use fakeroot to pretend to create all needed device nodes - $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \ - $(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR) + echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + >> $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) # Use fakeroot so genext2fs believes the previous fakery ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) GENEXT2_REALSIZE=`LANG=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \ @@ -92,29 +88,22 @@ ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \ GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \ set -x; \ - $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \ - $(GENEXT2_DIR)/genext2fs \ - -b $$GENEXT2_SIZE \ - -i $$GENEXT2_INODES \ - -d $(TARGET_DIR) \ - $(EXT2_OPTS) $(EXT2_BASE) + echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \ + "-i $$GENEXT2_INODES -d $(TARGET_DIR) " \ + "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) else - $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \ - $(GENEXT2_DIR)/genext2fs \ - -d $(TARGET_DIR) \ - $(EXT2_OPTS) \ - $(EXT2_BASE) + echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \ + "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) endif + chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) + $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) $(EXT2_BASE).gz: $(EXT2_BASE) @gzip --best -fv $(EXT2_BASE) EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO))) +# " stupid syntax highlighting does not like unmatched quote from above line ext2root: $(EXT2_TARGET) @ls -l $(EXT2_TARGET) |