summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-04-20 15:45:31 -0700
committerStanislaw Kardach <kda@semihalf.com>2016-04-20 15:45:31 -0700
commitbe5864d1622dc080718422b313cf9954b123c3b0 (patch)
tree43f52629877c89660276f7d155429a7095582364 /patches/opnfv-fuel
parentd7adccfac3b55fdac91554ebbef83cf68ccfaf5a (diff)
Cleanup patch-export bugs
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch4
-rw-r--r--patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch17
-rw-r--r--patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch2
3 files changed, 11 insertions, 12 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 10df99a8..719ec935 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,10 +8,10 @@ Subject: [PATCH] Allow customizing java and fuel-mirror URLs
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
-index a94d7e2..4ebf519 100644
+index a5e8a96..e64a05e 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
-@@ -12,6 +12,6 @@ ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c
+@@ -12,6 +12,6 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
export USE_JAVA8=true
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 279ab914..22396768 100644
--- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -8,8 +8,8 @@ Subject: [PATCH] Add arm64 deb repositories setup
build/install/apt-ftparchive-release.conf | 2 +-
build/install/apt-ftparchive-udeb.conf | 7 ++++++-
build/install/install.sh | 22 ++++++++++++++++++----
- build/install/uninstall.sh | 20 +++++++++++---------
- 6 files changed, 44 insertions(+), 16 deletions(-)
+ build/install/uninstall.sh | 18 ++++++++++--------
+ 6 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
index c93babe..30bad1d 100644
@@ -126,7 +126,7 @@ index 4e0389e..8c29e08 100755
cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
}
diff --git a/build/install/uninstall.sh b/build/install/uninstall.sh
-index a9e74bc..0266e17 100755
+index a9e74bc..e90c632 100755
--- a/build/install/uninstall.sh
+++ b/build/install/uninstall.sh
@@ -31,15 +31,17 @@ DEST=$MOUNT
@@ -137,17 +137,16 @@ index a9e74bc..0266e17 100755
- echo "Error - didn't find backup file for Packages!"
- exit 1
-fi
--
--if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
-- echo "Error - didn't find backup file for Packages.gz!"
-- exit 1
--fi
+for arch in arm64 amd64; do
+ if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
+ echo "Error - didn't find backup file for Packages for ${arch}!"
+ exit 1
+ fi
-+
+
+-if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
+- echo "Error - didn't find backup file for Packages.gz!"
+- 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/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
index a444a493..c47b166c 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, 3 insertions(+), 3 deletions(-)
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
-index 4ebf519..86d7b76 100644
+index e64a05e..bca432c 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -7,9 +7,9 @@