From 02ccb1767ade6c0e10741b0a7db12b880016b6a1 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 14 Sep 2015 11:23:57 -0400 Subject: [PATCH] changing branch to checkout from to arno/stable and placing all repo contents into /root instead of deploy.sh only in /bin Change-Id: I5c7c3a990bf18480b1e99a2119363e30e68e6d12 Signed-off-by: Dan Radez --- foreman/build/Makefile | 2 +- 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 -- 2.16.6