Permalink
Browse files

Changes needed to get the arm and arm64 builds working

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
  • Loading branch information...
1 parent 0d78101 commit a4cf5b47b2ddd799ddac66af27e8fb0c285661d5 @SvenDowideit SvenDowideit committed Nov 25, 2016
Showing with 6 additions and 3 deletions.
  1. +1 −1 Makefile
  2. +2 −2 scripts/installer/Dockerfile.arm64
  3. +3 −0 scripts/version
View
@@ -2,7 +2,7 @@ TARGETS := $(shell ls scripts | grep -vE 'clean|run|help|docs')
.dapper:
@echo Downloading dapper
- @curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m` > .dapper.tmp
+ @curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m|sed 's/v7l//'` > .dapper.tmp
@@chmod +x .dapper.tmp
@./.dapper.tmp -v
@mv .dapper.tmp .dapper
@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y parted git gcc make autoconf
RUN mkdir -p /usr/local/src && \
cd /usr/local/src && \
- git clone https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
- cd kexec-tools && git checkout kdump/for-14 && ./bootstrap && ./configure && make && make install
+ git clone -b kdump/v0.14 https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
+ cd kexec-tools && ./bootstrap && ./configure && make && make install
COPY conf lay-down-os seed-data set-disk-partitions /scripts/
COPY ./build/vmlinuz /dist/vmlinuz
View
@@ -18,5 +18,8 @@ export VERSION COMMIT
# Suffix
export SUFFIX=""
if [ -n "${ARCH}" ] && [ "${ARCH}" != "amd64" ]; then
+ # TODO: why is this not exported?
SUFFIX="_${ARCH}"
fi
+
+echo " Building ${VERSION} from ${COMMIT} on ${ARCH}"

0 comments on commit a4cf5b4

Please sign in to comment.