From 8763df973dbd5848f8351108e527791525c88fc1 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Fri, 26 Apr 2019 08:40:40 +0800 Subject: [PATCH] set 'busybox ash' dynamic-linked app from alpine linux as the default init shell in x86_64 environment --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d961b32..afbaa96 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ ucore_bin_path := ucore/build/$(arch) biscuit_bin_path := biscuit/build/$(arch) busybox := $(out_dir)/busybox alpine_version_major := 3.9 -alpine_version_full := 3.9.2 -alpine_file := alpine-minirootfs-3.9.2-$(arch).tar.gz +alpine_version_full := 3.9.3 +alpine_file := alpine-minirootfs-3.9.3-$(arch).tar.gz alpine := alpine/$(alpine_file) rust_build_args := --target targets/$(arch)-rcore.json @@ -111,7 +111,8 @@ ifeq ($(arch), $(filter $(arch), x86_64 aarch64)) @cd $(out_dir) && tar xvf ../../$(alpine) endif -build: rust ucore biscuit $(busybox) nginx redis iperf3 +#build: rust ucore biscuit $(busybox) nginx redis iperf3 +build: rust alpine sfsimg: $(out_qcow2)