From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 31 May 2016 18:21:22 +0000 (+0200)
Subject: p/Separate-armband-repo no longer needed.
X-Git-Tag: colorado.1.rc1~423^2~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=81682e66fc46cdd5aeede20e2c22d7da6df25784;p=armband.git

p/Separate-armband-repo no longer needed.

Since Fuel@OPNFV switched from carrying the orig ks.cfg to a patch
for this file in "Build system uplift to Fuel 9.0/Mitaka" [1],
we (Armband) can now drop this patch.

[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
---

diff --git a/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
deleted file mode 100644
index 670e8728..00000000
--- a/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 18 Apr 2016 17:24:25 +0200
-Subject: [PATCH] Separate armband repo-comp from upstream RPM repos.
-
-Instead of using linux.enea.com for ALL RPM packages for CentOS7,
-by overriding FUEL_MIRROR in the Makefile, we switched to using
-EXTRA_RPM_REPOS variable to point to armband RPM repo-component.
-
-This way, the bulk of RPM packages will be fetched from upstream,
-instead of our mirror.
-
-This requires updating ks.cfg{,.orig} with the new armband repo.
----
- build/f_isoroot/f_kscfg/ks.cfg      | 2 +-
- build/f_isoroot/f_kscfg/ks.cfg.orig | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
-index 30bad1d..b58f98b 100644
---- a/build/f_isoroot/f_kscfg/ks.cfg
-+++ b/build/f_isoroot/f_kscfg/ks.cfg
-@@ -14,7 +14,7 @@ unsupported_hardware
- # SKIP CONFIGURING X
- skipx
- repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100
--
-+repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10
- # NEVER ever place zerombr here, it breaks automated installation
- %include /tmp/bootloader.ks
- %include /tmp/partition.ks
-diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig
-index f8a43da..5f541a4 100755
---- a/build/f_isoroot/f_kscfg/ks.cfg.orig
-+++ b/build/f_isoroot/f_kscfg/ks.cfg.orig
-@@ -14,7 +14,7 @@ unsupported_hardware
- # SKIP CONFIGURING X
- skipx
- repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100
--
-+repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10
- # NEVER ever place zerombr here, it breaks automated installation
- %include /tmp/bootloader.ks
- %include /tmp/partition.ks