diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-15 15:12:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-15 15:12:25 +0000 |
| commit | 99a3f93de07d884101c8e6b37343280231e6c94a (patch) | |
| tree | 2e4d4b765c7e61e69757b5a4f041592f442f8076 /foreman | |
| parent | bfacf6ffb2f0d0e6ea28714acd78eabf5a682eef (diff) | |
| parent | 02ccb1767ade6c0e10741b0a7db12b880016b6a1 (diff) | |
Merge "changing branch to checkout from to arno/stable and placing all repo contents into /root instead of deploy.sh only in /bin" into stable/arno
Diffstat (limited to 'foreman')
| -rw-r--r-- | foreman/build/Makefile | 2 | ||||
| -rw-r--r-- | foreman/build/opnfv-genesis.spec | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/foreman/build/Makefile b/foreman/build/Makefile index 8b87ce6..09e91d2 100644 --- a/foreman/build/Makefile +++ b/foreman/build/Makefile @@ -106,7 +106,7 @@ rpm-clean: .PHONY: rpm rpm: - pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz + pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ origin/stable/arno | 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/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec index 674760f..bcac1a9 100644 --- a/foreman/build/opnfv-genesis.spec +++ b/foreman/build/opnfv-genesis.spec @@ -21,11 +21,12 @@ 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 |