| Message ID | 20230721171857.3612639-2-masahiroy@kernel.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] UML: hard-code the result of 'uname -s' | expand |
On 21. 07. 23, 19:18, Masahiro Yamada wrote: > The single build rule does not work with the core-y syntax. [1] > > Use the standard obj-y syntax. > > [1]: https://lore.kernel.org/linux-kbuild/d57ba55f-20a3-b836-783d-b49c8a161b6e@kernel.org/T/#m7bc402e1e038f00ebcf2e92ed7fcb8a52fc1ea44 > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Jiri Slaby <jirislaby@kernel.org> thanks,
On Sat, Jul 22, 2023 at 02:18:57AM +0900, Masahiro Yamada wrote: > The single build rule does not work with the core-y syntax. [1] > > Use the standard obj-y syntax. > > [1]: https://lore.kernel.org/linux-kbuild/d57ba55f-20a3-b836-783d-b49c8a161b6e@kernel.org/T/#m7bc402e1e038f00ebcf2e92ed7fcb8a52fc1ea44 > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> This resolves an issue I reported (but doesn't seem to be on lore for linux-kbuild...) Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Tested-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > Changes in v2: > - Rephase the commit log > > arch/um/Kbuild | 2 ++ > arch/um/Makefile | 4 ---- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/um/Kbuild b/arch/um/Kbuild > index a4e40e534e6a..6cf0c1e5927b 100644 > --- a/arch/um/Kbuild > +++ b/arch/um/Kbuild > @@ -1 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > + > +obj-y += kernel/ drivers/ os-Linux/ > diff --git a/arch/um/Makefile b/arch/um/Makefile > index 1735a562453d..82f05f250634 100644 > --- a/arch/um/Makefile > +++ b/arch/um/Makefile > @@ -22,10 +22,6 @@ ARCH_DIR := arch/um > # features. > SHELL := /bin/bash > > -core-y += $(ARCH_DIR)/kernel/ \ > - $(ARCH_DIR)/drivers/ \ > - $(ARCH_DIR)/os-Linux/ > - > MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas > > HEADER_ARCH := $(SUBARCH) > -- > 2.39.2 >
diff --git a/arch/um/Kbuild b/arch/um/Kbuild index a4e40e534e6a..6cf0c1e5927b 100644 --- a/arch/um/Kbuild +++ b/arch/um/Kbuild @@ -1 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only + +obj-y += kernel/ drivers/ os-Linux/ diff --git a/arch/um/Makefile b/arch/um/Makefile index 1735a562453d..82f05f250634 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -22,10 +22,6 @@ ARCH_DIR := arch/um # features. SHELL := /bin/bash -core-y += $(ARCH_DIR)/kernel/ \ - $(ARCH_DIR)/drivers/ \ - $(ARCH_DIR)/os-Linux/ - MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas HEADER_ARCH := $(SUBARCH)
The single build rule does not work with the core-y syntax. [1] Use the standard obj-y syntax. [1]: https://lore.kernel.org/linux-kbuild/d57ba55f-20a3-b836-783d-b49c8a161b6e@kernel.org/T/#m7bc402e1e038f00ebcf2e92ed7fcb8a52fc1ea44 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Changes in v2: - Rephase the commit log arch/um/Kbuild | 2 ++ arch/um/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)