tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
authored by
Masahiro Yamada
and committed by
Richard Weinberger
d32df108
ff3f7860
+4
-5
+3
-4
arch/um/Makefile
+3
-4
arch/um/Makefile
···
18
18
endif
19
19
20
20
ARCH_DIR := arch/um
21
-
OS := $(shell uname -s)
22
21
# We require bash because the vmlinux link and loader script cpp use bash
23
22
# features.
24
23
SHELL := /bin/bash
25
24
26
25
core-y += $(ARCH_DIR)/kernel/ \
27
26
$(ARCH_DIR)/drivers/ \
28
-
$(ARCH_DIR)/os-$(OS)/
27
+
$(ARCH_DIR)/os-Linux/
29
28
30
29
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
31
30
···
77
78
-idirafter $(objtree)/include -D__KERNEL__ -D__UM_HOST__
78
79
79
80
#This will adjust *FLAGS accordingly to the platform.
80
-
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
81
+
include $(srctree)/$(ARCH_DIR)/Makefile-os-Linux
81
82
82
83
KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
83
84
-I$(srctree)/$(HOST_DIR)/include/uapi \
···
154
155
@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
155
156
-o -name '*.gcov' \) -type f -print | xargs rm -f
156
157
157
-
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
158
+
export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH
+1
-1
arch/x86/um/Makefile
+1
-1
arch/x86/um/Makefile