From a44801f079e684dbc0956d9c3d6281eb6216957b Mon Sep 17 00:00:00 2001 From: Louis Burda Date: Wed, 1 Feb 2023 07:03:51 -0600 Subject: Fix build, add more build instructions to README --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8e6a872..fbbf409 100755 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ LINUX ?= linux -CORES ?= $(shell ls /dev/cpu | wc -l) +CORES ?= $(shell getconf _NPROCESSORS_ONLN) LOAD ?= $(CORES) JOBS ?= $(CORES) @@ -39,16 +39,16 @@ clean: $(LINUX)/arch/x86/kvm/cachepc: ln -sf $(PWD)/cachepc $@ -host: +linux: # build host kernel and Module.symvers for depmod cp extra/.config linux/.config git -C $(LINUX) add . git -C $(LINUX) stash - git -C $(LINUX) checkout 0aaa1e5 + git -C $(LINUX) checkout d9bd54fea4d2 rm -f $(LINUX)/arch/x86/kvm/cachepc - $(MAKE) -C $(LINUX) -j $(JOBS) -l $(LOAD) bindeb-pkg + $(MAKE) -C $(LINUX) -j $(JOBS) -l $(LOAD) git -C $(LINUX) checkout master - git -C $(LINUX) stash pop + git -C $(LINUX) stash pop || true build: $(LINUX)/arch/x86/kvm/cachepc $(MAKE) -C $(LINUX) -j $(JOBS) -l $(LOAD) M=arch/x86/kvm modules @@ -95,4 +95,4 @@ test/qemu-%: test/qemu-%.c $(TEST_SRCS) test/qemu-%_guest: test/qemu-%_guest.c $(CC) -o $@ $(filter %.c,$^) $(filter %.S,$^) $(GUEST_CFLAGS) $(LDLIBS) -.PHONY: all clean host build load prep +.PHONY: all clean linux build load prep -- cgit v1.2.3-71-gd317