Cleanup patch-export bugs

(cherry picked from commit be5864d1622dc080718422b313cf9954b123c3b0)

Change-Id: I85fc2afcf51c618f5680b95d596a264d60f16f53

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 b47518c..96b0e63 100644 (file)
--- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
+++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
@@ -36,7 +36,7 @@ index ca2d3e1..b0d410d 100644
  
      def take_action(self, parsed_args):
 diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
-index 0219961..1387cf9 100644
+index 0219961..6e60fb8 100644
 --- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
 +++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py
 @@ -172,7 +172,8 @@ def make_bootstrap(data):

diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch
index a199056..e90b283 100644 (file)
--- a/patches/fuel-agent/0005-Add-esp-partition-flag.patch
+++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch
@@ -12,7 +12,7 @@ to properly format and mount it during do_partitioning deployment phase.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index 3807ca7..bc532b4 100644
+index c2fef69..0ae81f9 100644
 --- a/fuel_agent/drivers/nailgun.py
 +++ b/fuel_agent/drivers/nailgun.py
 @@ -324,7 +324,7 @@ class Nailgun(BaseDataDriver):

diff --git a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
index 38b7045..6dd2306 100644 (file)
--- a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
+++ b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch
@@ -17,7 +17,7 @@ TODO: At least make this arch-dependant for mos8 ...
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index c2fef69..3807ca7 100644
+index 0ae81f9..bc532b4 100644
 --- a/fuel_agent/drivers/nailgun.py
 +++ b/fuel_agent/drivers/nailgun.py
 @@ -684,7 +684,7 @@ class NailgunBuildImage(BaseDataDriver):

diff --git a/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch b/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
index b1d4450..63f2c1c 100644 (file)
--- a/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
+++ b/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
@@ -29,7 +29,7 @@ index 8311731..1d7af2b 100644
 --- a/deployment/puppet/openstack/manifests/ceilometer.pp
 +++ b/deployment/puppet/openstack/manifests/ceilometer.pp
 @@ -195,8 +195,14 @@ class openstack::ceilometer (
-
+ 
    if ($on_compute) {
      if $::operatingsystem == 'Ubuntu' and $::ceilometer::params::libvirt_group {
 +      # Armband libvirt-bin deb package (1.3.2 version) creates 'libvirtd' group on Ubuntu

diff --git a/patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
similarity index 100%
rename from patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
rename to patches/fuel-library/0013-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch

diff --git a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
index 866e402..5239554 100644 (file)
--- a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+++ b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
@@ -14,15 +14,15 @@ supports parsing ethtool speed starting with version amos2 [1].
 [1] https://linux.enea.com/mos-repos/ubuntu/8.0/pool/main/o/
     ohai/ohai_6.14.0-2~u14.04+mos1+mos8.0+amos2_all.deb
 ---
- ...ohai-Support-reading-L1-info-from-ethtool.patch | 34 ++++++++++++++++++++++
+ ...ohai-Support-reading-L1-info-from-ethtool.patch | 30 ++++++++++++++++++++++
  debian/patches/series                              |  1 +
- 2 files changed, 35 insertions(+)
+ 2 files changed, 31 insertions(+)
  create mode 100644 debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
  create mode 100644 debian/patches/series
 
 diff --git a/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
 new file mode 100644
-index 0000000..aa50ea4
+index 0000000..8ae8c49
 --- /dev/null
 +++ b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
 @@ -0,0 +1,30 @@

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 e41275b..a9a9387 100644 (file)
--- 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
@@ -12,7 +12,7 @@ https://bugs.opendaylight.org/show_bug.cgi?id=3973
 
 Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
 ---
- .../modules/opendaylight/files/leveldb-arm64.patch |  36 +++++
+ .../modules/opendaylight/files/leveldb-arm64.patch |  35 +++++
  .../opendaylight/files/leveldbjni-native.patch     |  23 ++++
  .../puppet/modules/opendaylight/manifests/init.pp  |   8 ++
  .../modules/opendaylight/manifests/install.pp      |  12 +-
@@ -20,14 +20,14 @@ Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
  deployment_tasks.yaml                              |   2 +-
  odl_package/ubuntu/opendaylight                    |   4 +-
  pre_build_hook                                     |   9 +-
- 8 files changed, 235 insertions(+), 9 deletions(-)
+ 8 files changed, 234 insertions(+), 9 deletions(-)
  create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
  create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
  create mode 100644 deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 
 diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
 new file mode 100644
-index 0000000..c72efeb
+index 0000000..e0824ca
 --- /dev/null
 +++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
 @@ -0,0 +1,35 @@
@@ -68,7 +68,7 @@ index 0000000..c72efeb
 + }  // 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
+index 0000000..08a528b
 --- /dev/null
 +++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
 @@ -0,0 +1,23 @@
@@ -150,7 +150,7 @@ index 7a3bf3f..f9bba56 100644
  }
 diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 new file mode 100644
-index 0000000..c708611
+index 0000000..c599370
 --- /dev/null
 +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 @@ -0,0 +1,150 @@

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 10df99a..719ec93 100644 (file)
--- 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 279ab91..2239676 100644 (file)
--- 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 a444a49..c47b166 100644 (file)
--- 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 @@