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>

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index ff04b78efbebb1193c2ed49ee6c179b9a272d0ad..99d03f10cf2eae9373a53e6d53cf4a8c3460660c 100644 (file)
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -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
 

diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index e488cb5f8a30e2214baeec025983ccdfc4babeb5..2baece5fb0c4610c04d9e0ecc4fe1f48d60e6427 100644 (file)
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -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
 

diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index f1e4126e86fc8b7a7340d77d8d86f4b3fa07cdc6..7b2b0fb2cc0fae9a12a5d8713e4a1dc0c14196f8 100644 (file)
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -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))

diff --git a/package/freescale-imx/imx-uuc/imx-uuc.mk b/package/freescale-imx/imx-uuc/imx-uuc.mk
index c05cee31dbdba737ff689daf545b4fe19f1575e3..f24216da260f7fa0d309fa71250aeb363487f2a8 100644 (file)
--- a/package/freescale-imx/imx-uuc/imx-uuc.mk
+++ b/package/freescale-imx/imx-uuc/imx-uuc.mk
@@ -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

diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index c5826dfb8d5a986669909bf83a19bb3e97feb62e..a7bc41c89fa392c7b246aace64b40345afc9f24e 100644 (file)
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -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))

diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
index b6c5809134899f81d138e006d7a02458c4ab0792..6362792201784419c4d6793d19064164d05bbca8 100644 (file)
--- a/package/libselinux/libselinux.mk
+++ b/package/libselinux/libselinux.mk
@@ -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) \

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index df2e5a3ecd3782c7dfc3be1c624ecb99e13d24f4..7c3a2b6bda4f2a2cd0d713899e9af514f18f1ebb 100644 (file)
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -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

diff --git a/package/tzdump/tzdump.mk b/package/tzdump/tzdump.mk
index 3f035a56cbd35a757eeab8746c27233e63fcc5d0..baad978c4fcb8f6f423567b1d7d6746e2b84006d 100644 (file)
--- a/package/tzdump/tzdump.mk
+++ b/package/tzdump/tzdump.mk
@@ -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

diff --git a/package/zic/zic.mk b/package/zic/zic.mk
index de2f3c9676e7502325bfcbfa993313d3aa5af7ae..cbda414d3e9fcd7d3644d85bef3985b20a72b7b9 100644 (file)
--- a/package/zic/zic.mk
+++ b/package/zic/zic.mk
@@ -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