diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-18 17:32:44 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-18 17:34:42 +0200 |
commit | f67fcb05c8a5e8eca48aef084298aa4cfd57e344 (patch) | |
tree | ef0d45a35dcb468c845c8c01eb19908cee6c3955 /patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch | |
parent | 436dd54e66c530771caf5f19103e9027d0b74b8f (diff) |
Fix build issue introduced by RPM repo switch.
Adding another RPM repo also requires updating ks.cfg{.orig,} in
OPNFV fuel repository.
Update TODO by removing obsolete entries.
Also fix minor unrelated patch whitespace error.
Change-Id: I6a7f271d32c5d9c58aa48658e90e1cdbb0d59fdc
Diffstat (limited to 'patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch')
-rw-r--r-- | patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch new file mode 100644 index 00000000..670e8728 --- /dev/null +++ b/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch @@ -0,0 +1,43 @@ +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 |