From ea040ab01d88f833ede038ff2ba1d7d4b57872cd Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 2 Nov 2016 11:15:38 -0500 Subject: [PATCH] build: make the default machine x86_64 --- conf/local.conf.sample | 2 +- scripts/build.sh | 2 +- scripts/containerize.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 08e6e7e..3429110 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -35,7 +35,7 @@ #MACHINE ?= "edgerouter" # # This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemux86" +MACHINE ??= "qemux86-64" # # Where to place downloads diff --git a/scripts/build.sh b/scripts/build.sh index 7c40381..cfff7c1 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Grab the MACHINE from the environment; otherwise, set it to a sane default -export MACHINE="${MACHINE-qemux86}" +export MACHINE="${MACHINE-qemux86-64}" # What to build BUILD_TARGETS="\ diff --git a/scripts/containerize.sh b/scripts/containerize.sh index c9ac0db..499378b 100755 --- a/scripts/containerize.sh +++ b/scripts/containerize.sh @@ -43,7 +43,7 @@ exec docker run \ -e BUILD_UID=${my_uid} \ -e BUILD_GID=${my_gid} \ -e TEMPLATECONF=meta-rust/conf \ - -e MACHINE=${MACHINE:-qemux86} \ + -e MACHINE=${MACHINE:-qemux86-64} \ ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK="/tmp/ssh-agent/${SSH_AUTH_NAME}"} \ -v ${HOME}/.ssh:/var/build/.ssh \ -v "${PWD}":/var/build:rw \