build: change MINI-OS_ROOT to MINIOS_ROOT

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 <wei.liu2@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/Config.mk b/Config.mk
index e5d8ade1b5e1913874f333a7068b5669103f4336..9d19cd765f74a5a4f63b2e6c728642174ca361d9 100644 (file)
--- 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 cfe015a7a3f15d392b0bd25b8e882146cea33d25..10c05a576ff51362561b807e6a91adc9368e6c98 100644 (file)
--- 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 e4febe4682daf5d84e3ff419bc0c4022cfd1b1b1..be542dcf6593ebe77278b209c6d2af6e6a76c726 100644 (file)
--- 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 e042027105682bbf8befdc98ad1cc2eb5336ea2d..89534f7cf2f643e51547e078755df03592dc64ab 100644 (file)
--- 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))