Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1230123 > unrolled thread
| Started by | Feng Wu <feng.wu@intel.com> |
|---|---|
| First post | 2015-09-22 14:40 +0200 |
| Last post | 2015-09-22 15:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v2] Add virt directory to the top Makefile Feng Wu <feng.wu@intel.com> - 2015-09-22 14:40 +0200
Re: [PATCH v2] Add virt directory to the top Makefile Michal Marek <mmarek@suse.com> - 2015-09-22 15:40 +0200
| From | Feng Wu <feng.wu@intel.com> |
|---|---|
| Date | 2015-09-22 14:40 +0200 |
| Subject | [PATCH v2] Add virt directory to the top Makefile |
| Message-ID | <qbv1v-5qC-5@gated-at.bofh.it> |
We need to build files in virt/lib/, so add virt directory to the top Makefile. Signed-off-by: Feng Wu <feng.wu@intel.com> --- v2: - Remove the explicit 'virt' entry in the KBUILD_ALLDIRS assignment - Remove './' in virt/Makefile Makefile | 10 ++++++---- arch/x86/kvm/Makefile | 3 --- virt/Makefile | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 virt/Makefile diff --git a/Makefile b/Makefile index 35b4c19..0e60876 100644 --- a/Makefile +++ b/Makefile @@ -550,6 +550,7 @@ drivers-y := drivers/ sound/ firmware/ net-y := net/ libs-y := lib/ core-y := usr/ +virt-y := virt/ endif # KBUILD_EXTMOD ifeq ($(dot-config),1) @@ -890,10 +891,10 @@ core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ - $(net-y) $(net-m) $(libs-y) $(libs-m))) + $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y))) vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ - $(init-) $(core-) $(drivers-) $(net-) $(libs-)))) + $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) init-y := $(patsubst %/, %/built-in.o, $(init-y)) core-y := $(patsubst %/, %/built-in.o, $(core-y)) @@ -902,14 +903,15 @@ net-y := $(patsubst %/, %/built-in.o, $(net-y)) libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y)) libs-y := $(libs-y1) $(libs-y2) +virt-y := $(patsubst %/, %/built-in.o, $(virt-y)) # Externally visible symbols (used by link-vmlinux.sh) export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) -export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) +export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y) export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds export LDFLAGS_vmlinux # used by scripts/pacmage/Makefile -export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools virt) +export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools) vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 05cc2d7..67d215c 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -6,9 +6,6 @@ CFLAGS_svm.o := -I. CFLAGS_vmx.o := -I. KVM := ../../../virt/kvm -LIB := ../../../virt/lib - -obj-$(CONFIG_IRQ_BYPASS_MANAGER) += $(LIB)/ kvm-y += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \ $(KVM)/eventfd.o $(KVM)/irqchip.o $(KVM)/vfio.o diff --git a/virt/Makefile b/virt/Makefile new file mode 100644 index 0000000..be78347 --- /dev/null +++ b/virt/Makefile @@ -0,0 +1 @@ +obj-y += lib/ -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2015-09-22 15:40 +0200 |
| Message-ID | <qbvXA-6LG-39@gated-at.bofh.it> |
| In reply to | #1230123 |
Dne 22.9.2015 v 14:23 Feng Wu napsal(a): > We need to build files in virt/lib/, so add virt directory to > the top Makefile. > > Signed-off-by: Feng Wu <feng.wu@intel.com> > --- > v2: > - Remove the explicit 'virt' entry in the KBUILD_ALLDIRS assignment > - Remove './' in virt/Makefile Acked-by: Michal Marek <mmarek@suse.com> Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web