From: Alexandru Avadanii Date: Fri, 11 Aug 2017 13:45:17 +0000 (+0200) Subject: p/fuel: Rebase after lib.sh VGA patch got upstream X-Git-Tag: opnfv-5.0.RC1~92 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d81ba0acaf68ad4d5e8db943395431558d77b638;p=armband.git p/fuel: Rebase after lib.sh VGA patch got upstream Change-Id: Ibf6f633873e7dce9c38f6952710b7937b1290ac3 Signed-off-by: Alexandru Avadanii --- diff --git a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch deleted file mode 100644 index 7be7e52a..00000000 --- a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 11 Jul 2017 18:35:40 +0200 -Subject: [PATCH] lib.sh: AArch64: Use VGA video mode for guests - -On AArch64, there is no Cirrus video, so use VGA mode instead. -For now, we install vgabios package no matter the arch, although -it is only used on AArch64. - -On Debian systems, also fix a missing link for vgabios-stdvga.bin. -Based on previous Armband work from [1]. - -[1] https://github.com/opnfv/armband/blob/danube.2.0/patches/fuel-library/ - arm64-bug-fixes/0002-Install-vgabios-and-link-for-aarch64.patch - -Signed-off-by: Alexandru Avadanii ---- - ci/deploy.sh | 5 +++-- - mcp/scripts/lib.sh | 10 +++++++++- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index 7b3bf54..491b955 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -279,9 +279,10 @@ pushd "${DEPLOY_DIR}" > /dev/null - - # Install required packages - [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ -- git make rsync mkisofs curl virtinst cpu-checker qemu-kvm -+ git make rsync mkisofs curl virtinst cpu-checker qemu-kvm vgabios && \ -+ sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin - [ -n "$(command -v yum)" ] && sudo yum install -y \ -- git make rsync genisoimage curl virt-install qemu-kvm -+ git make rsync genisoimage curl virt-install qemu-kvm vgabios - - # Check scenario file existence - if [[ ! -f ../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml ]]; then -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 33dba3c..8d45100 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -78,6 +78,13 @@ create_vms() { - net_args="${net_args} --network ${net_type}=${net},model=virtio" - done - -+ # AArch64: prepare arch specific arguments -+ local virt_extra_args="" -+ if [ "$(uname -i)" = "aarch64" ]; then -+ # No Cirrus VGA on AArch64, use vga std -+ virt_extra_args="$virt_extra_args --video=vga" -+ fi -+ - # create vms with specified options - for node in "${vnodes[@]}"; do - # shellcheck disable=SC2086 -@@ -88,7 +95,8 @@ create_vms() { - --os-type linux --os-variant none \ - --boot hd --vnc --console pty --autostart --noreboot \ - --disk path="$(pwd)/images/mcp_${node}.iso",device=cdrom \ -- --noautoconsole -+ --noautoconsole \ -+ ${virt_extra_args} - done - } - diff --git a/patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch similarity index 98% rename from patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch rename to patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch index 4d27e4c0..43fe78af 100644 --- a/patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch +++ b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch @@ -11,7 +11,7 @@ Signed-off-by: Alexandru Avadanii 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh -index 3d0fb91..589a0c4 100755 +index 36ee27b..5732f4c 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -48,6 +48,10 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END diff --git a/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch similarity index 100% rename from patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch rename to patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch diff --git a/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch similarity index 100% rename from patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch rename to patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch diff --git a/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch similarity index 100% rename from patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch rename to patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch similarity index 100% rename from patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch rename to patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch