Commit d32df108 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Richard Weinberger
Browse files

um: Hard-code the result of 'uname -s' 



We rely on 'uname -s' returning 'Linux' because there are os-Linux/
directories, but no other os-*/.

Supporting a non-Linux host is unlikely to happen.

Let's hard-code 'Linux'.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent ff3f7860

arch/um/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -18,14 +18,13 @@ else 
endif



ARCH_DIR := arch/um

OS := $(shell uname -s)

# We require bash because the vmlinux link and loader script cpp use bash

# features.

SHELL := /bin/bash



core-y			+= $(ARCH_DIR)/kernel/		\

			   $(ARCH_DIR)/drivers/		\

			   $(ARCH_DIR)/os-$(OS)/

			   $(ARCH_DIR)/os-Linux/



MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -78,7 +77,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ 
		-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__



#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)

include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux



KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \

		   -I$(srctree)/$(HOST_DIR)/include/uapi \
@@ -155,4 +154,4 @@ archclean: 
	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \

		-o -name '*.gcov' \) -type f -print | xargs rm -f



export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
 
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH

arch/x86/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \ 
	ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \

	stub_$(BITS).o stub_segv.o \

	sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \

	mem_$(BITS).o subarch.o os-$(OS)/

	mem_$(BITS).o subarch.o os-Linux/



ifeq ($(CONFIG_X86_32),y)