diff options
| author | Eric Blake <eblake@redhat.com> | 2013-09-14 05:29:42 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2013-09-16 09:35:05 -0600 |
| commit | 6ccf92abfe5ec7719d7f8cbee8e6eb8e13159b33 (patch) | |
| tree | 1551c883d7a520202a023de48823126d821485bd /autobuild.sh | |
| parent | e62e0094dcd0ca1484491a9cc62919473b647f11 (diff) | |
| download | libvirt-6ccf92abfe5ec7719d7f8cbee8e6eb8e13159b33.tar.gz | |
build: make autobuild require rpm build deps
I spent far too long on a new machine trying to figure out why
./autobuild.sh failed due to an rpm build failure (complaining
that libvirt_parthelper was supposed to be packaged but was not
built), and finally traced it to a missing parted-devel
installation. I learned that --nodeps is in place for
autobuilder setups, but for developers, removing it would make
rpmbuild error out much sooner for a less cryptic failure.
* autobuild.sh: Conditionally drop --nodeps from rpmbuild lines.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'autobuild.sh')
| -rwxr-xr-x | autobuild.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/autobuild.sh b/autobuild.sh index e5aa35ca33..3109b492e5 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -8,6 +8,13 @@ set -v test -n "$1" && RESULTS=$1 || RESULTS=results.log : ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} +# If run under the autobuilder, we must use --nodeps with rpmbuild; +# but this can lead to odd error diagnosis for normal development. +nodeps= +if test "${AUTOBUILD_COUNTER+set}"; then + nodeps=--nodeps +fi + test -f Makefile && make -k distclean || : rm -rf coverage @@ -60,7 +67,7 @@ else fi if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild $nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean libvirt.spec @@ -111,7 +118,7 @@ fi if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild $nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean mingw-libvirt.spec |