From 984524fda1f8260e258421f6676d522591f025da Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 28 Jan 2014 21:11:25 +0100 Subject: [PATCH] fs: ensure $(TARGET_DIR_WARNING_FILE) is writable 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 Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 2 +- fs/common.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d8a8dad09..dc57cf440 100644 --- 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) diff --git a/fs/common.mk b/fs/common.mk index 9f3262019..30e752470 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -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)