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 <ezequiel.garcia@free-electrons.com> Signed-off-by: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
19d1cfdb25
commit
402d1476f7
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user