diff --git a/Makefile b/Makefile index 644eaf7c..9198eb34 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/scripts/installer/Dockerfile.arm64 b/scripts/installer/Dockerfile.arm64 index 9d902950..966bde1a 100644 --- a/scripts/installer/Dockerfile.arm64 +++ b/scripts/installer/Dockerfile.arm64 @@ -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 diff --git a/scripts/version b/scripts/version index d463f3d0..e9949750 100755 --- a/scripts/version +++ b/scripts/version @@ -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}"