Commit 9182a09b authored by Geoff Simmons's avatar Geoff Simmons

trackrdrd: bugfixing RPM/Jenkins build, workaround for SuSE RPM deleting

           everything in BUILDROOT
parent 08f8ec64
...@@ -42,7 +42,10 @@ done ...@@ -42,7 +42,10 @@ done
VERSION=$(grep ' VERSION ' $WORKSPACE/trackrdrd/config.h | sed 's/^.*"\([^"]*\)".*$/\1/') VERSION=$(grep ' VERSION ' $WORKSPACE/trackrdrd/config.h | sed 's/^.*"\([^"]*\)".*$/\1/')
REVISION=$(git show -s --pretty=format:%h) REVISION=$(git show -s --pretty=format:%h)
BUILDPATH=$WORKSPACE/trackrdrd/rpmbuild/BUILDROOT/trackrdrd-$VERSION-rev${REVISION}_build$BUILD_NUMBER.$(uname -m) BUILDPATH=$WORKSPACE/trackrdrd/rpmbuild/BUILD
BUILDROOTPREFIX=$WORKSPACE/trackrdrd/rpmbuild/BUILDROOT
PKGNAME=trackrdrd-$VERSION-rev${REVISION}_build$BUILD_NUMBER.$(uname -m)
BUILDROOTPATH=$BUILDROOTPREFIX/$PKGNAME
DESTDIR=$BUILDPATH make install DESTDIR=$BUILDPATH make install
[[ $? -ne 0 ]] && exit 1 [[ $? -ne 0 ]] && exit 1
...@@ -59,7 +62,7 @@ rpmbuild \ ...@@ -59,7 +62,7 @@ rpmbuild \
--define 'revision '$REVISION \ --define 'revision '$REVISION \
--define 'build_number '$BUILD_NUMBER \ --define 'build_number '$BUILD_NUMBER \
--define 'prefix '$LHOTSE_TRACKING_PREFIX \ --define 'prefix '$LHOTSE_TRACKING_PREFIX \
--buildroot $BUILDPATH -bb SPECS/trackrdrd.spec --buildroot $BUILDROOTPATH -bb SPECS/trackrdrd.spec
[[ $? -ne 0 ]] && exit 1 [[ $? -ne 0 ]] && exit 1
cd $WORKSPACE/trackrdrd cd $WORKSPACE/trackrdrd
......
...@@ -31,10 +31,11 @@ broker. ...@@ -31,10 +31,11 @@ broker.
# Empty section. # Empty section.
%install %install
# Empty section. cp -rP . $RPM_BUILD_ROOT
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
rm -rf %{_builddir}/*
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment