diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-09-25 07:26:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-25 07:26:28 +0000 |
| commit | 48914ddcaaf2d4aa1b62f9799a220065e2578b11 (patch) | |
| tree | 2ab9ce6d8bd74520182c75112fe0cc32fa418b7f /foreman/build | |
| parent | 5383bd288bd6915fe706fee3bc09cce2ee015b23 (diff) | |
| parent | 19353295cc1e3bf5dff72ab48d794087767c62d7 (diff) | |
Merge "Removed obsolete Fuel patches"
Diffstat (limited to 'foreman/build')
| -rw-r--r-- | foreman/build/Makefile | 6 | ||||
| -rw-r--r-- | foreman/build/cache.mk | 2 | ||||
| -rw-r--r-- | foreman/build/opnfv-genesis.spec | 17 |
3 files changed, 15 insertions, 10 deletions
diff --git a/foreman/build/Makefile b/foreman/build/Makefile index 8b87ce6..2d2a2a7 100644 --- a/foreman/build/Makefile +++ b/foreman/build/Makefile @@ -26,7 +26,7 @@ export VBOXDNLD = http://download.virtualbox.org/virtualbox/rpm/el/7.1/x86_64/Vi export VBOXRPM = $(shell pwd)/VirtualBox-4.3-4.3.26_98988_el7-1.x86_64.rpm export VAGRANTDNLD = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm export VAGRANTRPM = $(shell pwd)/vagrant_1.7.2_x86_64.rpm -export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.1-1.x86_64.rpm +export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.2-1.x86_64.rpm # Note! Invoke with "make REVSTATE=RXXXX all" to make release build! # Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location. @@ -106,8 +106,8 @@ rpm-clean: .PHONY: rpm rpm: - pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz - rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' + pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.2/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz + rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' @make rpm-clean diff --git a/foreman/build/cache.mk b/foreman/build/cache.mk index fdfd003..56b7273 100644 --- a/foreman/build/cache.mk +++ b/foreman/build/cache.mk @@ -16,6 +16,8 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS)) # BEGIN of variables to customize # CACHEFILES += .versions +CACHEFILES += $(shell basename $(VAGRANTRPM)) +CACHEFILES += $(shell basename $(VBOXRPM)) CACHEFILES += $(shell basename $(ISOSRC)) # # END of variables to customize diff --git a/foreman/build/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec index 674760f..30692b4 100644 --- a/foreman/build/opnfv-genesis.spec +++ b/foreman/build/opnfv-genesis.spec @@ -1,5 +1,5 @@ Name: opnfv-genesis -Version: 0.1 +Version: 0.2 Release: 1 Summary: The files from the OPNFV genesis repo @@ -8,8 +8,8 @@ License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/genesis.git Source0: opnfv-genesis.tar.gz -#BuildRequires: -Requires: vagrant, VirtualBox-4.3 +#BuildRequires: +Requires: vagrant, VirtualBox-4.3, net-tools %description The files from the OPNFV genesis repo @@ -21,13 +21,16 @@ The files from the OPNFV genesis repo %build %install -mkdir -p %{buildroot}/usr/bin/ -cp foreman/ci/deploy.sh %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/root/genesis +cp -r foreman/ %{buildroot}/root/genesis +cp -r common/ %{buildroot}/root/genesis %files -/usr/bin/deploy.sh +/root/genesis %changelog -* Fri Apr 24 2015 Dan Radez <dradez@redhatcom> - 0.1-1 +* Tue Sep 15 2015 Dan Radez <dradez@redhat.com> - 0.2-1 +- Updating the install files and cleaning up white space +* Fri Apr 24 2015 Dan Radez <dradez@redhat.com> - 0.1-1 - Initial Packaging |