mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin
Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
15bff58f3e
commit
0f9c0bf3d5
@@ -7,7 +7,7 @@
|
||||
ROOTFS_AXFS_DEPENDENCIES = host-axfsutils
|
||||
|
||||
define ROOTFS_AXFS_CMD
|
||||
$(HOST_DIR)/usr/bin/mkfs.axfs -s -a $(TARGET_DIR) $@
|
||||
$(HOST_DIR)/bin/mkfs.axfs -s -a $(TARGET_DIR) $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,axfs))
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
|
||||
|
||||
define ROOTFS_CLOOP_CMD
|
||||
$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | \
|
||||
$(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
|
||||
$(HOST_DIR)/bin/genisoimage -r $(TARGET_DIR) | \
|
||||
$(HOST_DIR)/bin/create_compressed_fs - 65536 > $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,cloop))
|
||||
|
||||
@@ -91,7 +91,7 @@ ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
|
||||
endif
|
||||
endif
|
||||
$$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE)
|
||||
echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
|
||||
$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
|
||||
echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
|
||||
echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
|
||||
@@ -100,7 +100,7 @@ ifeq ($$(BR2_REPRODUCIBLE),y)
|
||||
endif
|
||||
$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
$$(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),)
|
||||
|
||||
@@ -11,7 +11,7 @@ CRAMFS_OPTS = -l
|
||||
endif
|
||||
|
||||
define ROOTFS_CRAMFS_CMD
|
||||
$(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
|
||||
$(HOST_DIR)/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
|
||||
endef
|
||||
|
||||
ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
|
||||
|
||||
@@ -144,14 +144,14 @@ endif # ROOTFS_ISO9660_USE_INITRD
|
||||
|
||||
|
||||
define ROOTFS_ISO9660_CMD
|
||||
$(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
|
||||
$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
|
||||
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
||||
-o $@ $(ROOTFS_ISO9660_TARGET_DIR)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)
|
||||
define ROOTFS_ISO9660_GEN_HYBRID
|
||||
$(HOST_DIR)/usr/bin/isohybrid -t 0x96 $@
|
||||
$(HOST_DIR)/bin/isohybrid -t 0x96 $@
|
||||
endef
|
||||
|
||||
ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
ROOTFS_ROMFS_DEPENDENCIES = host-genromfs
|
||||
|
||||
define ROOTFS_ROMFS_CMD
|
||||
$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $@
|
||||
$(HOST_DIR)/bin/genromfs -d $(TARGET_DIR) -f $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,romfs))
|
||||
|
||||
@@ -25,7 +25,7 @@ endif
|
||||
endif
|
||||
|
||||
define ROOTFS_SQUASHFS_CMD
|
||||
$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
|
||||
$(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
|
||||
$(ROOTFS_SQUASHFS_ARGS)
|
||||
endef
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
ROOTFS_YAFFS2_DEPENDENCIES = host-yaffs2utils
|
||||
|
||||
define ROOTFS_YAFFS2_CMD
|
||||
$(HOST_DIR)/usr/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
|
||||
$(HOST_DIR)/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
|
||||
endef
|
||||
|
||||
$(eval $(call ROOTFS_TARGET,yaffs2))
|
||||
|
||||
Reference in New Issue
Block a user