From ccf57699bbff183ef45fd4a4e94df094ca69ee87 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 29 Mar 2016 14:42:46 +0200 Subject: [PATCH] Rebase patches and fix importing * We were missing the patch rebase changes that were introduced by gerrit automatic upstream project update for submodules. This patch introduces them. * Apply all submodule patches a single `git am` call to help with rebasing patches. * Correct Opendaylight plugin initialization in repo config. Signed-off-by: Stanislaw Kardach --- Makefile | 6 ++-- .../0006-direct-kernel-boot-for-cirros.patch | 2 +- ...1-fuel-plugin-Pick-updated-numa.-packages.patch | 33 ---------------------- .../0004-direct-kernel-boot-for-cirros.patch | 2 +- ...low-customizing-java-and-fuel-mirror-URLs.patch | 4 +-- .../0007-Allow-customizing-fuel-plugin-qemu.patch | 6 ++-- ...llow-customizing-fuel-plugin-opendaylight.patch | 2 +- upstream/fuel-plugin-opendaylight | 0 8 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch mode change 100644 => 160000 upstream/fuel-plugin-opendaylight diff --git a/Makefile b/Makefile index 294a8861..d5303465 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ patches-import: @git submodule -q foreach 'git tag armband-workbench-root' @git submodule -q foreach 'git checkout -q -b armband-workbench' @git submodule -q foreach \ - 'for p in $$(ls ${root}/patches/$$name/); do \ - git am ${root}/patches/$$name/$$p; \ - done' + 'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \ + git am ${root}/patches/$$name/*.patch; \ + fi' clean-docker: docker stop FUEL_CENTOS_8.0 || true docker rm $(docker ps -a -q) || true diff --git a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch index 0c110430..065ea408 100644 --- a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch @@ -116,7 +116,7 @@ index 04d597c..c342830 100755 exit 1 unless errors == 0 diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb -index 88b2c73..65e9400 100644 +index 2d030d9..b33fb25 100644 --- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb +++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb @@ -3,9 +3,15 @@ diff --git a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch b/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch deleted file mode 100644 index 22f3b226..00000000 --- a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Stanislaw Kardach -Date: Sat, 5 Mar 2016 15:14:41 +0100 -Subject: [PATCH] fuel plugin: Pick updated numa... packages. - -Package version 1ubuntu3.14.04.1 of numactl_2.0.9~rc5, -libnuma1_2.0.9~rc5 and libnuma-dev_2.0.9~rc5 is removed from -archive.ubuntu.com and replaced with 1ubuntu3.14.04.2. - -TODO: This can be modified by using docker/chroot combined with apt-get -download. ---- - fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -index 7d62008..1766086 100644 ---- a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -+++ b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -@@ -71,11 +71,11 @@ http://archive.ubuntu.com/ubuntu/pool/main/b/bc/bc_1.06.95-8ubuntu1_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/pkg-config/pkg-config_0.26-1ubuntu4_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/d/dbus/libdbus-1-dev_1.6.18-0ubuntu4.3_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python-defaults/libpython-dev_2.7.5-5ubuntu3_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/universe/n/numactl/numactl_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/universe/n/numactl/numactl_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python2.7/python2.7-dev_2.7.6-8ubuntu0.2_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python-defaults/python-dev_2.7.5-5ubuntu3_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma1_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma1_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb - https://pypi.python.org/packages/source/l/libvirt-python/libvirt-python-1.2.12.tar.gz - http://archive.ubuntu.com/ubuntu/pool/main/libg/libgpg-error/libgpg-error-dev_1.12-0.2ubuntu1_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/libg/libgcrypt11/libgcrypt11-dev_1.5.3-2ubuntu4.3_amd64.deb diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch index 0d133274..bec998f9 100644 --- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch @@ -35,7 +35,7 @@ index 16dc3fa..23d6589 100644 class VmwareDeploymentSerializerMixin(object): diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py -index b8b38e2..54b1614 100644 +index b8b38e2..b76a3d3 100644 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ b/nailgun/nailgun/orchestrator/deployment_serializers.py @@ -274,6 +274,9 @@ class DeploymentMultinodeSerializer(object): diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch index 66668355..410aa19d 100644 --- a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch +++ b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Allow customizing java and fuel-mirror URLs 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index f2a47b7..b0bc9c7 100644 +index 5287ca8..3ecf680 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-release @@ -17,9 +17,9 @@ index f2a47b7..b0bc9c7 100644 export USE_JAVA8=true -export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb +export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb + export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz .PHONY: all - all: .odlbuild diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index e95dbf2..709ca6b 100644 --- a/build/f_isoroot/f_repobuild/Makefile diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch index 440d20e5..b34da17b 100644 --- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch +++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch @@ -7,15 +7,15 @@ Subject: [PATCH] Allow customizing fuel-plugin-qemu 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk -index e9c4356..c23e9c2 100644 +index e4a7d39..3f0107c 100644 --- a/build/f_isoroot/f_qemupluginbuild/config.mk +++ b/build/f_isoroot/f_qemupluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --QEMU_BRANCH=292b588b5fe444651cca92d7511383ac42253984 +-QEMU_BRANCH=1eb8bf930e2ec6e64526e95fcb21124f7401a243 -QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu -+QEMU_BRANCH:=292b588b5fe444651cca92d7511383ac42253984 ++QEMU_BRANCH:=1eb8bf930e2ec6e64526e95fcb21124f7401a243 +QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu QEMU_CHANGE= diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch index dd043892..61ba7e3c 100644 --- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch @@ -8,7 +8,7 @@ Signed-off-by: Florin Dumitrascu 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index b0bc9c7..cc305e0 100644 +index 3ecf680..b0449d0 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,8 +8,8 @@ diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight deleted file mode 100644 index 32e4fa8c..00000000 --- a/upstream/fuel-plugin-opendaylight +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2a24fe8e5ead193dd5ad9f4bec5a2d23db89f681 diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight new file mode 160000 index 00000000..2a24fe8e --- /dev/null +++ b/upstream/fuel-plugin-opendaylight @@ -0,0 +1 @@ +Subproject commit 2a24fe8e5ead193dd5ad9f4bec5a2d23db89f681 -- 2.16.6