diff options
| -rw-r--r-- | package/busybox/initramfs.mk | 2 | ||||
| -rw-r--r-- | target/cpio/cpioroot.mk | 2 | ||||
| -rw-r--r-- | target/cramfs/cramfs.mk | 2 | ||||
| -rw-r--r-- | target/device/Atmel/u-boot/u-boot.mk | 2 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 2 | ||||
| -rw-r--r-- | target/initramfs/initramfs.mk | 2 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 2 | ||||
| -rw-r--r-- | target/makedevs/makedevs.mk | 14 | ||||
| -rw-r--r-- | target/romfs/romfs.mk | 2 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 2 | ||||
| -rw-r--r-- | target/tar/tarroot.mk | 2 | ||||
| -rw-r--r-- | target/ubifs/ubifsroot.mk | 2 |
12 files changed, 17 insertions, 19 deletions
diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index c2e144c86..1c10d0f5b 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -111,7 +111,7 @@ $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox $(PROJECT_BUILD_DIR)/initramfs/etc/inittab rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) (echo "chown -R 0:0 $(PROJECT_BUILD_DIR)/initramfs"; \ - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(PROJECT_BUILD_DIR)/initramfs"; \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(PROJECT_BUILD_DIR)/initramfs"; \ echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \ ) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index d0c522545..b851f3c8d 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -55,7 +55,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) endif # Use fakeroot so tar believes the previous fakery diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 34a54c43d..ecbfd8a50 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -68,7 +68,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) endif # Use fakeroot so mkcramfs believes the previous fakery diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index e15332cae..60e18e42d 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -223,7 +223,7 @@ ubootroot: host-fakeroot makedevs uboot cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) # Use fakeroot so mkuboot believes the previous fakery echo "$(UBOOT_DIR)/uboot-tools/mkuboot " \ diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 9d5f837a1..bb7b0f016 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -106,7 +106,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) endif # Use fakeroot so genext2fs believes the previous fakery diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index d7a77c17c..09340f09f 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -31,7 +31,7 @@ endif cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) # Use fakeroot so gen_initramfs_list.sh believes the previous fakery echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index dc176cde5..743d2d765 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -67,7 +67,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) endif # Use fakeroot so mkfs.jffs2 believes the previous fakery diff --git a/target/makedevs/makedevs.mk b/target/makedevs/makedevs.mk index 6cebd71d6..fe426cafe 100644 --- a/target/makedevs/makedevs.mk +++ b/target/makedevs/makedevs.mk @@ -5,7 +5,7 @@ # with fakeroot. # ############################################################# -MAKEDEVS_DIR=$(BUILD_DIR)/makedevs +MAKEDEVS_DIR=$(BUILD_DIR)/makedevs-host $(MAKEDEVS_DIR)/makedevs.c: target/makedevs/makedevs.c rm -rf $(MAKEDEVS_DIR) @@ -13,19 +13,17 @@ $(MAKEDEVS_DIR)/makedevs.c: target/makedevs/makedevs.c cp target/makedevs/makedevs.c $(MAKEDEVS_DIR) $(MAKEDEVS_DIR)/makedevs: $(MAKEDEVS_DIR)/makedevs.c - $(HOSTCC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $(MAKEDEVS_DIR)/makedevs - touch -c $(MAKEDEVS_DIR)/makedevs + $(HOSTCC) -Wall -Werror -O2 $(MAKEDEVS_DIR)/makedevs.c -o $@ -$(STAGING_DIR)/bin/makedevs: $(MAKEDEVS_DIR)/makedevs - $(INSTALL) -m 755 $(MAKEDEVS_DIR)/makedevs $(STAGING_DIR)/bin/makedevs - touch -c $(STAGING_DIR)/bin/makedevs +$(HOST_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs + $(INSTALL) -m 755 $^ $@ -makedevs: $(STAGING_DIR)/bin/makedevs +makedevs: $(HOST_DIR)/usr/bin/makedevs makedevs-source: makedevs-clean: - -rm -rf $(MAKEDEVS_DIR) + rm -rf $(MAKEDEVS_DIR)/makedevs makedevs-dirclean: rm -rf $(MAKEDEVS_DIR) diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk index 52caca752..d28705503 100644 --- a/target/romfs/romfs.mk +++ b/target/romfs/romfs.mk @@ -52,7 +52,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) endif # Use fakeroot so genromfs believes the previous fakery diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 6ccd503fb..ab701a540 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -59,7 +59,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) endif # Use fakeroot so mksquashfs believes the previous fakery diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index b9d8923a6..2e1ab2cd1 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -40,7 +40,7 @@ endif echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) endif # Use fakeroot so tar believes the previous fakery diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk index f0b519d81..3412f5e3e 100644 --- a/target/ubifs/ubifsroot.mk +++ b/target/ubifs/ubifsroot.mk @@ -98,7 +98,7 @@ ifneq ($(BR2_TARGET_ROOTFS_UBIFS_SQUASH),) endif ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes - echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) endif # Use fakeroot so mkfs.ubifs believes the previous fakery |