patches/opnfv-fuel/000099-FIXME-Remove-repo-mirror-cz.patch.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Wed, 1 Jun 2016 21:44:49 +0200
   3 Subject: [PATCH] FIXME: Remove repo-mirror-cz.patch.
   4
   5 Upstream removed all mirrors but usa and cz, and changed
   6 its default to mirror.fuel-infra.org in [1].
   7
   8 This allows us to drop patching of fuel-main/config.mk
   9 with the Czech mirror.
  10
  11 If needed, USE_MIRROR=cz can be specified as an env var.
  12
  13 FIXME: Remove when Fuel@OPNFV pulls change and deals with it.
  14
  15 [1] https://github.com/openstack/fuel-main/commit/
  16     751d502cfe15d9c9df0ee89530ac3b0b73aa1638
  17
  18 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  19 ---
  20  build/Makefile             |  2 --
  21  build/repo-mirror-cz.patch | 19 -------------------
  22  2 files changed, 21 deletions(-)
  23  delete mode 100644 build/repo-mirror-cz.patch
  24
  25 diff --git a/build/Makefile b/build/Makefile
  26 index e84edcd..211177d 100644
  27 --- a/build/Makefile
  28 +++ b/build/Makefile
  29 @@ -106,8 +106,6 @@ $(ISOCACHE):
  30         fi
  31         cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
  32         @echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE)
  33 -       # Patch for using the Czech Fuel mirror
  34 -       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/repo-mirror-cz.patch
  35         # Remove Docker optimizations, otherwise multistrap will fail during
  36         # Fuel build.
  37         sudo rm -f /etc/apt/apt.conf.d/docker*
  38 diff --git a/build/repo-mirror-cz.patch b/build/repo-mirror-cz.patch
  39 deleted file mode 100644
  40 index aa8eaf9..0000000
  41 --- a/build/repo-mirror-cz.patch
  42 +++ /dev/null
  43 @@ -1,19 +0,0 @@
  44 -*** config.mk.orig     Thu Jan  7 23:30:38 2016
  45 ---- config.mk  Thu Jan  7 23:32:36 2016
  46 -***************
  47 -*** 153,159 ****
  48 -  # 'msk', 'srt', 'usa', 'hrk', 'cz'
  49 -  # Setting any other value or removing of this variable will cause
  50 -  # download of all the packages directly from internet
  51 -! USE_MIRROR?=ext
  52 -
  53 -  ifeq ($(USE_MIRROR),ext)
  54 -  MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
  55 ---- 153,159 ----
  56 -  # 'msk', 'srt', 'usa', 'hrk', 'cz'
  57 -  # Setting any other value or removing of this variable will cause
  58 -  # download of all the packages directly from internet
  59 -! USE_MIRROR?=cz
  60 -
  61 -  ifeq ($(USE_MIRROR),ext)
  62 -  MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/