lkml.org 
[lkml]   [2023]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/2] UML: hard-code the result of 'uname -s'
    Date
    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>
    ---

    (no changes since v1)

    arch/um/Makefile | 7 +++----
    arch/x86/um/Makefile | 2 +-
    2 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/arch/um/Makefile b/arch/um/Makefile
    index da4d5256af2f..1735a562453d 100644
    --- a/arch/um/Makefile
    +++ b/arch/um/Makefile
    @@ -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
    diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
    index ee89f6bb9242..e207e6748aa2 100644
    --- a/arch/x86/um/Makefile
    +++ b/arch/x86/um/Makefile
    @@ -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)

    --
    2.39.2
    \
     
     \ /
      Last update: 2023-07-21 19:20    [W:3.588 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site