[v2] build: change MINI-OS_ROOT to MINIOS_ROOT

Commit Message

Wei Liu May 2, 2016, 5:26 p.m. UTC

In the GNU make manual "How to Use Variables" section there is such
word:

"However, variable names containing characters other than letters,
numbers, and underscores should be considered carefully, as in some
shells they cannot be passed through the environment to a sub-make (see
Communicating Variables to a Sub-make)."

I discover xen stubdom fails to build on Ubuntu 16.04 and Debian
unstable due to MINI-OS_ROOT is not preserved in the invocation of
sub-make, while stubdom builds fine on older versions of Ubuntu and
Debian. It's hard to track down what exactly is changed in those
systems, but changing MINI-OS_ROOT to MINIOS_ROOT fixes the problem.

Signed-off-by: Wei Liu <[e-mail]>
Acked-by: Samuel Thibault <[e-mail]>
---
Cc: Samuel Thibault <[e-mail]>
Cc: [e-mail]

v2: use MINIOS_ROOT instead
---
 Config.mk        | 14 +++++++-------
 Makefile         |  2 +-
 config/MiniOS.mk |  4 ++--
 minios.mk        |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

Comments

Wei Liu May 4, 2016, 9:27 a.m. UTC | #1

On Mon, May 02, 2016 at 06:26:35PM +0100, Wei Liu wrote:
> In the GNU make manual "How to Use Variables" section there is such
> word:
> 
> "However, variable names containing characters other than letters,
> numbers, and underscores should be considered carefully, as in some
> shells they cannot be passed through the environment to a sub-make (see
> Communicating Variables to a Sub-make)."
> 
> I discover xen stubdom fails to build on Ubuntu 16.04 and Debian
> unstable due to MINI-OS_ROOT is not preserved in the invocation of
> sub-make, while stubdom builds fine on older versions of Ubuntu and
> Debian. It's hard to track down what exactly is changed in those
> systems, but changing MINI-OS_ROOT to MINIOS_ROOT fixes the problem.
> 
> Signed-off-by: Wei Liu <[e-mail]>
> Acked-by: Samuel Thibault <[e-mail]>
> ---
> Cc: Samuel Thibault <[e-mail]>
> Cc: [e-mail]
> 

I've pushed this to mini-os.git master branch.

This is also a candidate to backport to 4.6 branch. I will wait a bit
before I actually do it.

Wei.

Patch

diff --git a/Config.mk b/Config.mk
index e5d8ade..9d19cd7 100644
--- a/Config.mk
+++ b/Config.mk
@@ -27,11 +27,11 @@  cc-option = $(shell if test -z "`echo 'void*p=1;' | \
 # stubdom, some XEN_ variables are set, set MINIOS_ variables accordingly.
 #
 ifneq ($(XEN_ROOT),)
-MINI-OS_ROOT=$(XEN_ROOT)/extras/mini-os
+MINIOS_ROOT=$(XEN_ROOT)/extras/mini-os
 else
-MINI-OS_ROOT=$(TOPLEVEL_DIR)
+MINIOS_ROOT=$(TOPLEVEL_DIR)
 endif
-export MINI-OS_ROOT
+export MINIOS_ROOT
 
 ifneq ($(XEN_TARGET_ARCH),)
 MINIOS_TARGET_ARCH = $(XEN_TARGET_ARCH)
@@ -78,16 +78,16 @@  EXTRA_INC = $(ARCH_INC)
 
 # Include the architecture family's special makerules.
 # This must be before include minios.mk!
-include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
+include $(MINIOS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
 
-extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir))
+extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(MINIOS_ROOT)/include/$(dir))
 
-DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include
+DEF_CPPFLAGS += -isystem $(MINIOS_ROOT)/include
 DEF_CPPFLAGS += -D__MINIOS__
 
 ifeq ($(libc),y)
 DEF_CPPFLAGS += -DHAVE_LIBC
-DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include/posix
+DEF_CPPFLAGS += -isystem $(MINIOS_ROOT)/include/posix
 DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore/include
 endif
 
diff --git a/Makefile b/Makefile
index cfe015a..10c05a5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@  EXTRA_DEPS += $(MINIOS_CONFIG)
 include $(MINIOS_CONFIG)
 endif
 
-include $(MINI-OS_ROOT)/config/MiniOS.mk
+include $(MINIOS_ROOT)/config/MiniOS.mk
 
 # Configuration defaults
 CONFIG_START_NETWORK ?= y
diff --git a/config/MiniOS.mk b/config/MiniOS.mk
index e4febe4..be542dc 100644
--- a/config/MiniOS.mk
+++ b/config/MiniOS.mk
@@ -1,5 +1,5 @@ 
-include $(MINI-OS_ROOT)/config/StdGNU.mk
-include $(MINI-OS_ROOT)/Config.mk
+include $(MINIOS_ROOT)/config/StdGNU.mk
+include $(MINIOS_ROOT)/Config.mk
 CFLAGS += $(DEF_CFLAGS) $(ARCH_CFLAGS)
 CPPFLAGS += $(DEF_CPPFLAGS) $(ARCH_CPPFLAGS) $(extra_incl)
 ASFLAGS += $(DEF_ASFLAGS) $(ARCH_ASFLAGS)
diff --git a/minios.mk b/minios.mk
index e042027..89534f7 100644
--- a/minios.mk
+++ b/minios.mk
@@ -39,12 +39,12 @@  LDFLAGS := $(DEF_LDFLAGS) $(ARCH_LDFLAGS)
 
 # Special build dependencies.
 # Rebuild all after touching this/these file(s)
-EXTRA_DEPS += $(MINI-OS_ROOT)/minios.mk
-EXTRA_DEPS += $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
+EXTRA_DEPS += $(MINIOS_ROOT)/minios.mk
+EXTRA_DEPS += $(MINIOS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk
 
 # Find all header files for checking dependencies.
-HDRS := $(wildcard $(MINI-OS_ROOT)/include/*.h)
-HDRS += $(wildcard $(MINI-OS_ROOT)/include/xen/*.h)
+HDRS := $(wildcard $(MINIOS_ROOT)/include/*.h)
+HDRS += $(wildcard $(MINIOS_ROOT)/include/xen/*.h)
 HDRS += $(wildcard $(ARCH_INC)/*.h)
 # For special wanted header directories.
 extra_heads := $(foreach dir,$(EXTRA_INC),$(wildcard $(dir)/*.h))