From ab8236bdac946b338d2a52fe1e4b3cdfa31eaaac Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 1 Oct 2015 15:39:20 -0700 Subject: [PATCH] Support kernels from local directories, but just remote URLs --- .gitignore | 2 +- Makefile.docker | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38ff8a7b..f3fbff37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .DS_Store -/assets +/assets/ca.crt /state /bin /build diff --git a/Makefile.docker b/Makefile.docker index dfa4578a..067aa0e3 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -26,7 +26,8 @@ $(DIST)/artifacts/vmlinuz: $(BUILD)/kernel/ $(BUILD)/kernel/: - mkdir -p $@ && curl -L "$(COMPILED_KERNEL_URL)" | tar -xzf - -C $@ --strip=0 + mkdir -p $@ + ([ -e "$(COMPILED_KERNEL_URL)" ] && cat "$(COMPILED_KERNEL_URL)" || curl -L "$(COMPILED_KERNEL_URL)") | tar -xzf - -C $@ $(BUILD)/images.tar: bin/rancheros