diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-19 14:47:35 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-19 14:47:35 +0200 |
| commit | fe06da781bf153fded6c88012083c07427b74464 (patch) | |
| tree | b71f8086c2b618161f492c77abb09cd4a6baea5e /target/cpio/cpioroot.mk | |
| parent | f5239c327e303a1470829c641bc2d9e28c819d23 (diff) | |
| parent | 84a8eafd4cbd103e89194ed1768cc43760ecde3a (diff) | |
| download | buildroot-novena-fe06da781bf153fded6c88012083c07427b74464.tar.gz buildroot-novena-fe06da781bf153fded6c88012083c07427b74464.zip | |
Merge branch 'huge-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'target/cpio/cpioroot.mk')
| -rw-r--r-- | target/cpio/cpioroot.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 0dbdb2eb4..2197d1050 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -40,21 +40,21 @@ cpioroot-init: $(CPIO_BASE): host-fakeroot makedevs cpioroot-init # Use fakeroot to pretend all target binaries are owned by root - rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 - cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) endif # Use fakeroot so tar believes the previous fakery echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_BASE)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - #-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + #-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifeq ($(CPIO_ROOTFS_COMPRESSOR),) ifneq ($(ROOTFS_CPIO_COPYTO),) $(Q)cp -f $(CPIO_BASE) $(ROOTFS_CPIO_COPYTO) |