[Buildroot] [PATCH] fs/common.mk: Strip extra whitespace when device table is empty

Ezequiel Garcia ezequiel.garcia at free-electrons.com
Wed Mar 13 12:28:16 UTC 2013


Since ROOTFS_DEVICE_TABLES it is a concatenation of two strings
separated by spaces, there will always be a space on 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 the 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 <ezequiel.garcia at free-electrons.com>
Signed-off-by: Thomas De Schampheleire <patrickdepinguin+buildroot at gmail.com>
---
 fs/common.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/common.mk b/fs/common.mk
index 8b5b2f2..a0b7b39 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
 
-- 
1.7.8.6



More information about the buildroot mailing list