summaryrefslogtreecommitdiff
path: root/target/cramfs
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-04-10 22:49:48 +0000
committerEric Andersen <andersen@codepoet.org>2006-04-10 22:49:48 +0000
commit674d61d84b2b754057be95038462b97ad83f759f (patch)
tree08f19974441080147b1a2406bbe62b5847035162 /target/cramfs
parentbfcb34c69f8a1e28bbd2daf3d5841350fa855f10 (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/cramfs')
-rw-r--r--target/cramfs/cramfs.mk21
1 files changed, 8 insertions, 13 deletions
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index bc73b9371..7e8891676 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -6,6 +6,7 @@
CRAMFS_DIR=$(BUILD_DIR)/cramfs-1.1
CRAMFS_SOURCE=cramfs-1.1.tar.gz
ifeq ($(strip $(subst ",,$(BR2_SOURCEFORGE_MIRROR))),unc)
+# " stupid syntax highlighting does not like unmatched quote from above line
# UNC does not seem to have cramfs
CRAMFS_SITE=http://internap.dl.sourceforge.net/sourceforge/cramfs
else
@@ -70,21 +71,15 @@ 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)
- -$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
- chown -R root:root $(TARGET_DIR)
+ echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
# Use fakeroot to pretend to create all needed device nodes
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_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 $CRAMFS_TARGET)
# Use fakeroot so mkcramfs believes the previous fakery
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
- -s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
- $(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) \
- $(TARGET_DIR) $(CRAMFS_TARGET)
+ echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) " \
+ "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
+ chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
+ $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
-@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
cramfsroot-source: cramfs-source