deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Globally replace $(HOST_DIR)/usr/sbin with $(HOST_DIR)/sbin 

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/sbin' | xargs sed -i 's%$(HOST_DIR)/usr/sbin%$(HOST_DIR)/sbin%g'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017.08.x
Arnout Vandecappelle 2017-07-05 13:14:20 +02:00 committed by Thomas Petazzoni
parent 0f9c0bf3d5
commit 1eb57df2b2
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext2/ext2.mk
View File

@ -20,7 +20,7 @@ ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs
define ROOTFS_EXT2_CMD
rm -f $@
$(HOST_DIR)/usr/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \
$(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \
$(BR2_TARGET_ROOTFS_EXT2_BLOCKS)
endef

2
fs/ubifs/ubi.mk
View File

@ -25,7 +25,7 @@ endif
define ROOTFS_UBI_CMD
sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
$(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
rm $(BUILD_DIR)/ubinize.cfg
endef

2
fs/ubifs/ubifs.mk
View File

@ -21,7 +21,7 @@ UBIFS_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OPTS))
ROOTFS_UBIFS_DEPENDENCIES = host-mtd
define ROOTFS_UBIFS_CMD
$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
$(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
endef
$(eval $(call ROOTFS_TARGET,ubifs))

2
package/freescale-imx/imx-uuc/imx-uuc.mk
View File

@ -21,7 +21,7 @@ define IMX_UUC_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 755 $(@D)/uuc $(TARGET_DIR)/usr/bin/uuc
$(INSTALL) -D -m 755 $(@D)/sdimage $(TARGET_DIR)/usr/bin/sdimage
dd if=/dev/zero of=$(TARGET_DIR)/fat bs=1M count=1
$(HOST_DIR)/usr/sbin/mkfs.vfat $(TARGET_DIR)/fat
$(HOST_DIR)/sbin/mkfs.vfat $(TARGET_DIR)/fat
endef
define IMX_UUC_INSTALL_INIT_SYSV

2
package/gptfdisk/gptfdisk.mk
View File

@ -48,7 +48,7 @@ define HOST_GPTFDISK_BUILD_CMDS
endef
define HOST_GPTFDISK_INSTALL_CMDS
$(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/usr/sbin/sgdisk
$(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/sbin/sgdisk
endef
$(eval $(generic-package))

2
package/libselinux/libselinux.mk
View File

@ -106,7 +106,7 @@ endef
define HOST_LIBSELINUX_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \
SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/usr/sbin install
SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/sbin install
(cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so)
# Install python interface wrapper
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \

4
package/mtd/mtd.mk
View File

@ -46,8 +46,8 @@ endif
HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2
SUMTOOL = $(HOST_DIR)/sbin/sumtool
MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios

4
package/tzdump/tzdump.mk
View File

@ -13,9 +13,9 @@ define HOST_TZDUMP_BUILD_CMDS
endef
define HOST_TZDUMP_INSTALL_CMDS
$(INSTALL) -m 0755 -D $(@D)/tzdump $(HOST_DIR)/usr/sbin/tzdump
$(INSTALL) -m 0755 -D $(@D)/tzdump $(HOST_DIR)/sbin/tzdump
endef
$(eval $(host-generic-package))
TZDUMP = $(HOST_DIR)/usr/sbin/tzdump
TZDUMP = $(HOST_DIR)/sbin/tzdump

4
package/zic/zic.mk
View File

@ -15,10 +15,10 @@ define HOST_ZIC_BUILD_CMDS
endef
define HOST_ZIC_INSTALL_CMDS
$(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/usr/sbin/zic
$(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/sbin/zic
$(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/usr/include/tzfile.h
endef
$(eval $(host-generic-package))
ZIC = $(HOST_DIR)/usr/sbin/zic
ZIC = $(HOST_DIR)/sbin/zic