From 402d1476f7159ab8055ec8b811b4fb5cd78b5609 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 13 Mar 2013 02:28:16 +0000 Subject: [PATCH] fs/common.mk: Strip extra whitespace when device table is empty Since ROOTFS_DEVICE_TABLES is a concatenation of two strings separated by spaces, there will always be a space in it, which means it's never empty. Therefore, when testing for empty, the condition never evaluate to false. The following change fixes this problem; it runs qstrip on the overall combination of the variables, causing the space to be removed if it's the only thing left. Tested-by: Ezequiel Garcia Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- fs/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 8b5b2f2e86..a0b7b3909c 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -33,8 +33,8 @@ FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt -ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \ - $(call qstrip,$(BR2_ROOTFS_STATIC_DEVICE_TABLE)) +ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ + $(BR2_ROOTFS_STATIC_DEVICE_TABLE)) define ROOTFS_TARGET_INTERNAL