diff options
author | Gabriel Ganne <gabriel.ganne@enea.com> | 2017-11-27 15:38:53 +0100 |
---|---|---|
committer | Jan Gelety <jgelety@cisco.com> | 2018-01-10 15:42:43 +0100 |
commit | c7eb2002bcd007520309feb3e11a26ff847a4e05 (patch) | |
tree | 84ea1d5513da1bb0f4e078aec87b44cf653a7e7c /resources/libraries/bash/qemu_build.sh | |
parent | a95c54b7821596402e0aa7136cd7d1de71a5b187 (diff) |
add new topology parameter: arch
if unset, arch variable will default to "x86_64"
* Note on "arm64" vs "aarch64"
debian-based uses arm64
rhel-based uses aarch64
qemu binaries of both distribs uses aarch64
dpdk uses arm64
vpp uses aarch64
python machine modules uses aarch64
=> prefer aarch64 to use the same nomenclature as vpp
* add ARCH argument to:
init_dpdk.sh, install_dpdk.sh, run_l2fwd.sh, install_tldk.sh, run_tldk.sh.
default to x86_64
converts "aarch64" if needed for dpdk naming convention
* fixed terminal end detection to allow "~]# "
add dut node arch as param to all robot set bin calls
* add --target-list flag to qemu_build.sh
defaults to x86_64-softmmu
* add arch flag to all the topology files
* topologies/available/ (and example file)
* resources/tools/virl/topologies/
* set _qemu_bin path using node['arch'] in qemu_set_node()
Change-Id: If46d88d064d213d3e4c6fc584bb8e0d4b6428cb8
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Diffstat (limited to 'resources/libraries/bash/qemu_build.sh')
-rwxr-xr-x | resources/libraries/bash/qemu_build.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/resources/libraries/bash/qemu_build.sh b/resources/libraries/bash/qemu_build.sh index 5fbbef809e..57520a9b5e 100755 --- a/resources/libraries/bash/qemu_build.sh +++ b/resources/libraries/bash/qemu_build.sh @@ -18,6 +18,7 @@ QEMU_DOWNLOAD_PACKAGE="${QEMU_VERSION}.tar.xz" QEMU_PACKAGE_URL="${QEMU_DOWNLOAD_REPO}${QEMU_DOWNLOAD_PACKAGE}" QEMU_INSTALL_DIR="/opt/${QEMU_VERSION}" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +TARGET_LIST="x86_64-softmmu" for i in "$@"; do case $i in @@ -33,6 +34,9 @@ for i in "$@"; do --force) FORCE=1 shift ;; + --target-list) + TARGET_LIST="${i#*=}" + shift ;; *) ;; esac @@ -78,7 +82,7 @@ then fi # Build -./configure --target-list=x86_64-softmmu --prefix=${QEMU_INSTALL_DIR} || \ +./configure --target-list=${TARGET_LIST} --prefix=${QEMU_INSTALL_DIR} || \ { echo "Failed to configure ${QEMU_VERSION}"; exit 1; } make -j`nproc` || \ { echo "Failed to compile ${QEMU_VERSION}"; exit 1; } |