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/tar | |
| 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/tar')
| -rw-r--r-- | target/tar/tarroot.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index 6215134d9..5002db57a 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -16,20 +16,15 @@ 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) - -$(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \ - chown -R root:root $(TARGET_DIR) + echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) # Use fakeroot to pretend to create all needed device nodes - $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_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 $TAR_TARGET) # Use fakeroot so tar believes the previous fakery - $(STAGING_DIR)/usr/bin/fakeroot \ - -i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \ - -s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \ - tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) . + echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \ + >> $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) + chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) + $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) tarroot-source: |