From 8f2b06f455f23bc6e191a8aa2930756d668aca3e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Apr 2018 02:08:19 -0300 Subject: [PATCH] fs/ubi: use namespace for internal variable UBINIZE_CONFIG_FILE_PATH is only used inside this file, so rename it to start with UBI_, following the namespace convention already used by common packages. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- fs/ubi/ubi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk index c78feda5a3..9874e73ff6 100644 --- a/fs/ubi/ubi.mk +++ b/fs/ubi/ubi.mk @@ -15,16 +15,16 @@ UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS)) ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs ifeq ($(BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG),y) -UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE)) +UBI_UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE)) else -UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg +UBI_UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg endif # don't use sed -i as it misbehaves on systems with SELinux enabled when this is # executed through fakeroot (see #9386) define ROOTFS_UBI_CMD sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \ - $(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg + $(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg $(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg endef -- 2.30.2