From d967773e7f9feea3b9ce57c9c5db9106b7f7538c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 16 Aug 2016 19:38:26 +0200
Subject: qemu: enhancements

---
 src/tests/qemu/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tests/qemu/Makefile')

diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index 0e5ab0d..f0f5b91 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -1,7 +1,7 @@
 PWD := $(shell pwd)
 
 # Set these from the environment to override
-KERNEL_VERSION ?= 4.7
+KERNEL_VERSION ?= 4.7.1
 BUILD_PATH ?= $(PWD)/build
 DISTFILES_PATH ?= $(PWD)/distfiles
 DEBUG_KERNEL ?= no
@@ -118,10 +118,10 @@ $(KERNEL_PATH)/.config: kernel.config | $(KERNEL_PATH)/.installed
 	-[ "$(DEBUG_KERNEL)" = "yes" ] && ( cd $(KERNEL_PATH) && scripts/kconfig/merge_config.sh -n .config $(PWD)/debug.config )
 
 $(KERNEL_BZIMAGE): $(KERNEL_PATH)/.installed $(KERNEL_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(MUSL_PATH)/lib/libc.so $(IPERF_PATH)/src/iperf3 $(BUILD_PATH)/tools/wg $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-multi $(NMAP_PATH)/ncat/ncat $(BUILD_PATH)/init ../netns.sh $(WIREGUARD_SOURCES) $(TOOLS_SOURCES)
-	$(MAKE) -C $(KERNEL_PATH)
+	LOCALVERSION="" $(MAKE) -C $(KERNEL_PATH)
 
 $(BUILD_PATH)/include/linux/.installed: | $(KERNEL_PATH)/.installed
-	$(MAKE) -C $(KERNEL_PATH) INSTALL_HDR_PATH=$(BUILD_PATH) headers_install
+	LOCALVERSION="" $(MAKE) -C $(KERNEL_PATH) INSTALL_HDR_PATH=$(BUILD_PATH) headers_install
 	touch $@
 
 $(MUSL_PATH)/lib/libc.so: $(MUSL_TAR) | $(BUILD_PATH)/include/linux/.installed
@@ -165,7 +165,7 @@ $(BUILD_PATH)/tools/wg: $(MUSL_CC) $(TOOLS_SOURCES) $(LIBMNL_PATH)/src/.libs/lib
 	strip -s $@
 
 $(BUILD_PATH)/init: init.c $(MUSL_CC)
-	$(MUSL_CC) -o $@ $<
+	$(MUSL_CC) -o $@ -O3 -std=gnu11 $<
 	strip -s $@
 
 $(IPUTILS_PATH)/.installed: $(IPUTILS_TAR)
-- 
cgit v1.2.3-59-g8ed1b