diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-04-18 17:32:44 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:31:46 +0000 |
| commit | c656e073e5fc72532709815986884fe871901531 (patch) | |
| tree | 2b25195f8e4492d045bca335a58982e20a56b24b | |
| parent | 5a5baea85fff33b3c5f509210e23a1a6464895d1 (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
(cherry picked from commit f67fcb05c8a5e8eca48aef084298aa4cfd57e344)
3 files changed, 44 insertions, 8 deletions
@@ -7,7 +7,6 @@ Nice to have, should be fixed before rel Cleanup tasks ========================================= -* [armband-rpm-repo] Armband CentOS repository as additional repo (x86_64) * [arm64-master] Find `puppetlabs-products` repo for arm64. * [arm64-master] Fix license in ubuntu_1404_arm64.pp * [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp @@ -16,8 +15,6 @@ Cleanup tasks * [ohai] ThunderX network card speed reported as N/A * [arm64-master] change docker repo in `upstream/fuel/build/config.mk`, perhaps by figuring out current architecture with `uname -m` -* [arm64-master] Fuel Master YUM repos still point to mirror.fuel-infra.org, - due to bootstrap_admin_node.sh hardcodes from OPNFV Needed for all arch support (todo, later) ========================================= 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 911001f4..866e402f 100644 --- 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 @@ -25,8 +25,7 @@ new file mode 100644 index 0000000..aa50ea4 --- /dev/null +++ b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch -@@ -0,0 +1,34 @@ -+From 942c67f74c00b1097d1ad27ece79fe91b475190c Mon Sep 17 00:00:00 2001 +@@ -0,0 +1,30 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sat, 2 Apr 2016 22:54:27 +0200 +Subject: [PATCH] ohai: Support reading L1 info from ethtool. @@ -57,9 +56,6 @@ index 0000000..aa50ea4 + end + elsif (addrinfo[:family] rescue nil) =~ /^inet$/ + int_meta[:ip] = addr -+-- -+1.9.1 -+ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b221a98 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 |