summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-17 15:13:52 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-17 15:19:58 +0200
commitf55f96c79945e3c6c6d0fe907f8520a9eacd2677 (patch)
tree59f510e1b7fffd9e76ee2772cd3c2f90b3b36093
parentbc97394b41507955e58793df6859882ebb540ee4 (diff)
Rebase after "Bugfix Broadcast Group".
While we're at if, fix whitespace errors in affected patches. Change-Id: Ic14e3e13f9503ab4b9307e55c731825b8a33da3b
-rw-r--r--patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch2
-rw-r--r--patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch9
-rw-r--r--patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch2
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch4
4 files changed, 8 insertions, 9 deletions
diff --git a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
index e5e76c79..b47518ce 100644
--- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
+++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
@@ -44,7 +44,7 @@ index 0219961..1387cf9 100644
LOG.info("Try to build image with data:\n%s", yaml.safe_dump(bootdata))
- opts = ['--data_driver', 'bootstrap_build_image']
-+ opts = ['--data_driver', 'bootstrap_build_image',
++ opts = ['--data_driver', 'bootstrap_build_image',
+ '--target_arch', data['target_arch']]
if data.get('image_build_dir'):
opts.extend(['--image_build_dir', data['image_build_dir']])
diff --git a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
index b439b38e..e41275b5 100644
--- a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
+++ b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
@@ -30,7 +30,7 @@ new file mode 100644
index 0000000..c72efeb
--- /dev/null
+++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,35 @@
+diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
+index e17bf43..78cb6b3 100644
+--- a/port/atomic_pointer.h
@@ -66,7 +66,6 @@ index 0000000..c72efeb
+ #undef ARCH_CPU_PPC_FAMILY
+
+ } // namespace port
-+
diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
new file mode 100644
index 0000000..7520205
@@ -78,13 +77,13 @@ index 0000000..7520205
+--- a/leveldbjni-all/pom.xml
++++ b/leveldbjni-all/pom.xml
+@@ -41,7 +41,7 @@
-+
++
+ <groupId>org.fusesource.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+- <version>1.8</version>
++ <version>1.8-odl</version>
+ <packaging>bundle</packaging>
-+
++
+ <name>${project.artifactId}</name>
+@@ -119,7 +119,8 @@
+ META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86,
@@ -215,7 +214,7 @@ index 0000000..c708611
+ ensure => 'present',
+ }
+ }
-+ if ! defined(Package['openjdk-7-jdk']) {
++ if ! defined(Package['openjdk-7-jdk']) {
+ package { 'openjdk-7-jdk':
+ ensure => 'present',
+ }
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
index 496acf07..279ab914 100644
--- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -147,7 +147,7 @@ index a9e74bc..0266e17 100755
+ echo "Error - didn't find backup file for Packages for ${arch}!"
+ exit 1
+ fi
-+
++
+ if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
+ echo "Error - didn't find backup file for Packages.gz for ${arch}!"
+ exit 1
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
index 8634687f..a444a493 100644
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch
@@ -16,10 +16,10 @@ index 4ebf519..86d7b76 100644
##############################################################################
-ODL_BRANCH=brahmaputra-sr2
--ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c
+-ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
+ODL_BRANCH:=brahmaputra-sr2
-+ODL_CHANGE:=b876df2345bf8c785dceea74f4c271fdfcc9563c
++ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a
+ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git"
export USE_JAVA8=true