fs: ensure $(TARGET_DIR_WARNING_FILE) is writable
authorYann E. MORIN <yann.morin.1998@free.fr>
Tue, 28 Jan 2014 20:11:25 +0000 (21:11 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 28 Jan 2014 21:57:52 +0000 (22:57 +0100)
If the Buildroot tree is read-only, then $(TARGET_DIR_WARNING_FILE) is
copied read-only into target/ but we may want to remove it during the
build process.

This poses no real problem, since target/ itself is guaranteed to be
writable, but for good measure, force $(TARGET_DIR_WARNING_FILE) to be
writable itself.

Reported-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Makefile
fs/common.mk

index d8a8dad093f229e50c12786859309c2b39884386..dc57cf440fd40d126dff136507f6377925a6cef3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -475,7 +475,7 @@ $(BUILD_DIR)/.root:
        rsync -a $(RSYNC_VCS_EXCLUSIONS) \
                --chmod=Du+w --exclude .empty --exclude '*~' \
                $(TARGET_SKELETON)/ $(TARGET_DIR)/
-       cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
+       $(INSTALL) -m 0644 support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
        @ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
        @mkdir -p $(TARGET_DIR)/usr
        @ln -snf lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
index 9f3262019bc137b34a5b3828604efb20994d5f35..30e752470e7563b18ae73062b743ad215f2401ec 100644 (file)
@@ -83,7 +83,7 @@ endif
        echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
        chmod a+x $$(FAKEROOT_SCRIPT)
        $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
-       cp support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
+       $(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
        -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
 ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
        $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)