Commit e1c0469e authored by Geoff Simmons's avatar Geoff Simmons

trackrdrd: bugfixing RPM/Jenkins build -- name the buildroot explicitly

parent d7a7783e
......@@ -41,6 +41,7 @@ done
VERSION=$(grep ' VERSION ' $WORKSPACE/trackrdrd/config.h | sed 's/^.*"\([^"]*\)".*$/\1/')
REVISION=$(git show -s --pretty=format:%h)
BUILDPATH=$WORKSPACE/trackrdrd/rpmbuild/BUILDROOT/trackrdrd-$VERSION-rev${REVISION}_build$BUILD_NUMBER.$(uname -m)
DESTDIR=$BUILDPATH make install
[[ $? -ne 0 ]] && exit 1
......@@ -52,5 +53,14 @@ cp $WORKSPACE/trackrdrd/etc/sample.conf $BUILDPATH/$LHOTSE_TRACKING_PREFIX/etc/
cp $WORKSPACE/trackrdrd/etc/trackrdrd $BUILDPATH/etc/init.d/
cd $WORKSPACE/trackrdrd/rpmbuild
rpmbuild --define '_topdir '$WORKSPACE/trackrdrd/rpmbuild --define 'version '$VERSION --define 'revision '$REVISION --define 'build_number '$BUILD_NUMBER --define 'prefix '$LHOTSE_TRACKING_PREFIX -bb SPECS/trackrdrd.spec
rpmbuild \
--define '_topdir '$WORKSPACE/trackrdrd/rpmbuild \
--define 'version '$VERSION \
--define 'revision '$REVISION \
--define 'build_number '$BUILD_NUMBER \
--define 'prefix '$LHOTSE_TRACKING_PREFIX \
--buildroot $BUILDPATH -bb SPECS/trackrdrd.spec
[[ $? -ne 0 ]] && exit 1
cd $WORKSPACE/trackrdrd
make clean
......@@ -8,7 +8,8 @@ Group: System Environment/Daemons
URL: https://qspa.otto.de/confluence/display/LHOT/C-Implementierung
Packager: LHOTSE Operations <lhotse-ops@dv.otto.de>
#Source0: git@git.lhotse.ov.otto.de:lhotse-tracking-varnish
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#BuildRoot: %{_topdir}/BUILDROOT
#BuildRequires: XXX
#Requires: varnish_bestats
#Requires: libactivemq
......
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