diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer | Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 15:07:29 +0200 |
| commit | ccf57699bbff183ef45fd4a4e94df094ca69ee87 (patch) | |
| tree | d9944c56ff1126f3bdbb6afaaba8f862c6b5352b /patches/opnfv-fuel | |
| parent | f101dd4429858b1b313eec81959576d974b34f23 (diff) | |
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 <stanislaw.kardach@caviumnetworks.com>
Diffstat (limited to 'patches/opnfv-fuel')
3 files changed, 6 insertions, 6 deletions
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 <florin.dumitrascu@enea.com> 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 @@ |