diff options
| author | Devaev Maxim <[email protected]> | 2018-07-09 02:48:16 +0000 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-07-09 02:48:16 +0000 |
| commit | 47fdafb495362e082f71e6ccdab729f0281c2653 (patch) | |
| tree | 6f7bd58485223b326a55b0ddae4119f4ea09c9a6 /os | |
| parent | c53132a2b8ba15223bbf43461d2a46b13ac53a79 (diff) | |
fixed os build
Diffstat (limited to 'os')
| -rw-r--r-- | os/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/os/Makefile b/os/Makefile index 97cd4eeb..f2855855 100644 --- a/os/Makefile +++ b/os/Makefile @@ -1,4 +1,5 @@ -_BUILD_DIR=./.build +_BUILD_DIR = ./.build +_KVMD_VERSION = $(shell bash -c 'source ../kvmd/PKGBUILD; echo $$pkgver') all: @ cat Makefile @@ -6,12 +7,15 @@ all: v1: make _pikvm PIKVM_PLATFORM=v1 +shell: + cd $(_BUILD_DIR) && make shell + _pikvm: $(_BUILD_DIR) rm -rf $(_BUILD_DIR)/stages/pikvm rm -rf $(_BUILD_DIR)/builder/scripts/pikvm cp -a platforms/$(PIKVM_PLATFORM) $(_BUILD_DIR)/stages/pikvm cd $(_BUILD_DIR) && make binfmt && make _rpi \ - BUILD_OPTS="--build-arg KVMD_VERSION=`bash -c '. ../kvmd/PKGBUILD; echo $$pkgver'`" \ + BUILD_OPTS="--build-arg $(_KVMD_VERSION)" \ PROJECT=pi-kvm \ PLATFORM=rpi-2 \ STAGES="__init__ os ssh watchdog ro pikvm __cleanup__" \ |