rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-07 11:58:38 +00:00
Code Issues Releases Wiki Activity

Changes needed to get the arm and arm64 builds working

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2016-11-25 10:10:21 +10:00
parent 0d7810120f
commit a4cf5b47b2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ TARGETS := $(shell ls scripts | grep -vE 'clean|run|help|docs')
.dapper: .dapper:
@echo Downloading 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 @@chmod +x .dapper.tmp
@./.dapper.tmp -v @./.dapper.tmp -v
@mv .dapper.tmp .dapper @mv .dapper.tmp .dapper

4
scripts/installer/Dockerfile.arm64
View File

@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y parted git gcc make autoconf
RUN mkdir -p /usr/local/src && \ RUN mkdir -p /usr/local/src && \
cd /usr/local/src && \ cd /usr/local/src && \
git clone https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \ git clone -b kdump/v0.14 https://git.linaro.org/people/takahiro.akashi/kexec-tools.git && \
cd kexec-tools && git checkout kdump/for-14 && ./bootstrap && ./configure && make && make install cd kexec-tools && ./bootstrap && ./configure && make && make install
COPY conf lay-down-os seed-data set-disk-partitions /scripts/ COPY conf lay-down-os seed-data set-disk-partitions /scripts/
COPY ./build/vmlinuz /dist/vmlinuz COPY ./build/vmlinuz /dist/vmlinuz

3
scripts/version
View File

@ -18,5 +18,8 @@ export VERSION COMMIT
# Suffix # Suffix
export SUFFIX="" export SUFFIX=""
if [ -n "${ARCH}" ] && [ "${ARCH}" != "amd64" ]; then if [ -n "${ARCH}" ] && [ "${ARCH}" != "amd64" ]; then
# TODO: why is this not exported?
SUFFIX="_${ARCH}" SUFFIX="_${ARCH}"
fi fi
echo " Building ${VERSION} from ${COMMIT} on ${ARCH}"