Cleanup: Kill submodule: fuel-plugin-qemu.

Since we only build ODL plugin on arm64 for now, kill
fuel-plugin-qemu submodule in armband repo.

Change-Id: Ib7a6dfe7e1dbd03771e3f28d2769d54659280901
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit c25ef1bb7537eef4df3169b603b087c6de126bef)

diff --git a/.gitmodules b/.gitmodules
index 4f15986..801e386 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,10 +22,6 @@
        path = upstream/fuel-mirror
        url = https://github.com/openstack/fuel-mirror.git
        branch = stable/8.0
-[submodule "fuel-plugin-qemu"]
-       path = upstream/fuel-plugin-qemu
-       url = https://github.com/openstack/fuel-plugin-qemu.git
-       branch = master
 [submodule "fuel-plugin-ovsnfv"]
        path = upstream/fuel-plugin-ovsnfv
        url = https://gerrit.opnfv.org/gerrit/p/ovsnfv.git

diff --git a/Makefile b/Makefile
index c59f830..27215be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,6 @@ build:
                        FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
                        FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
                        FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
-                       QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
                        OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
                        ODL_CHANGE= \
@@ -73,7 +72,6 @@ build:
                        FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
-                       QEMU_BRANCH=HEAD \
                        OVSNFV_DPDK_BRANCH=armband-workbench \
                        ODL_BRANCH=armband-workbench \
                        PRODUCT_VERSION=8.0 \

diff --git a/TODO.md b/TODO.md
index c5cff4d..ad9c493 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,6 @@ Cleanup tasks
 * [arm64-master] Fix license in ubuntu_1404_arm64.pp
 * [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp
 * [arm64-master] [fuel-agent] Package and repo update for arm64 in [2] (?)
-* [fuel] Add QEMU_VERSION for fuel-plugin-qemu
 * [arm64-master] change docker repo in `upstream/fuel/build/config.mk`,
   perhaps by figuring out current architecture with `uname -m`
 

diff --git a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch b/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
deleted file mode 100644 (file)
index 9a77c3a..0000000
--- a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Fri, 4 Mar 2016 14:26:43 +0100
-Subject: [PATCH] Fix apt cache and qemu version handling
-
----
- qemu/build-qemu.sh | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/qemu/build-qemu.sh b/qemu/build-qemu.sh
-index 652939e..f54f486 100755
---- a/qemu/build-qemu.sh
-+++ b/qemu/build-qemu.sh
-@@ -1,11 +1,12 @@
- #!/bin/bash
- wget http://wiki.qemu-project.org/download/qemu-2.2.1.tar.bz2
-+sudo apt-get update -y
- sudo apt-get build-dep qemu -y
- sudo apt-get install devscripts -y
- sudo apt-get install dpkg-dev -y
--apt-get source qemu -y
--dpkg-source -x qemu_2.0.0+dfsg-2ubuntu1.21.dsc
--cd qemu-2.0.0+dfsg; uupdate -v 2.2.1 ../qemu-2.2.1.tar.bz2
-+apt-get source qemu=2.0.0 -y
-+dpkg-source -x qemu_2.0.0*.dsc
-+cd qemu-2.0.0*; uupdate -v 2.2.1 ../qemu-2.2.1.tar.bz2
- cd ../qemu-2.2.1;echo "">> debian/patches/series
- sed -i 's/seccomp="yes"/seccomp="no"/' configure
- debian/rules build

diff --git a/upstream/fuel-plugin-qemu b/upstream/fuel-plugin-qemu
deleted file mode 160000 (submodule)
index 1eb8bf9..0000000
--- a/upstream/fuel-plugin-qemu
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1eb8bf930e2ec6e64526e95fcb21124f7401a243