From 58a098e08ec131338b0c29b902472c54b2a26168 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 6 Dec 2016 12:58:55 -0500 Subject: Fixes and cleans up build/cache directory usage Changes include: - Building is isolated to a .build directory that is git ignored - Caching is isolated to a .cache directory that is git ignored - Build scripts have been variablized, and relative paths have been removed - Unused files removed - build.sh, make file cleaned up - Fixed broken building of markupsafe and jinja2 packages - make clean-cache will remove the cache now - per item cleans are removed in place of simple clean .build now - includes fix for OSC issue with LP# 1642301 Change-Id: I42b8e4eb694bf0a2c398858814f8b73785931896 Signed-off-by: Tim Rozet --- build/rpm_specs/opnfv-apex-onos.spec | 4 +++- build/rpm_specs/opnfv-apex.spec | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'build/rpm_specs') diff --git a/build/rpm_specs/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec index ef1c66da..7bdd7772 100644 --- a/build/rpm_specs/opnfv-apex-onos.spec +++ b/build/rpm_specs/opnfv-apex-onos.spec @@ -21,13 +21,15 @@ https://wiki.opnfv.org/apex %install mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ -install build/images/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ +install build/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ %files %defattr(644, root, root, -) %{_var}/opt/opnfv/images/overcloud-full-onos.qcow2 %changelog +* Wed Dec 7 2016 Tim Rozet - 4.0-2 +- Make install path consistent * Wed Nov 2 2016 Dan Radez - 4.0-1 - Version update for Danube * Mon Apr 04 2016 Dan Radez - 3.0-0 diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 1844d8c5..a74733c5 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -21,13 +21,15 @@ https://wiki.opnfv.org/apex %install mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ -install build/images/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ +install build/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ %files %defattr(644, root, root, -) %{_var}/opt/opnfv/images/overcloud-full-opendaylight.qcow2 %changelog +* Wed Dec 7 2016 Tim Rozet - 4.0-2 +- Make install path consistent * Wed Nov 2 2016 Dan Radez - 4.0-1 - Version update for Danube * Mon Apr 04 2016 Dan Radez - 3.0-0 -- cgit 1.2.3-korg