mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 03:25:20 +00:00
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>
This commit is contained in:
parent
e62e0094dc
commit
6ccf92abfe
11
autobuild.sh
11
autobuild.sh
@ -8,6 +8,13 @@ set -v
|
|||||||
test -n "$1" && RESULTS=$1 || RESULTS=results.log
|
test -n "$1" && RESULTS=$1 || RESULTS=results.log
|
||||||
: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder}
|
: ${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 || :
|
test -f Makefile && make -k distclean || :
|
||||||
rm -rf coverage
|
rm -rf coverage
|
||||||
|
|
||||||
@ -60,7 +67,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test -f /usr/bin/rpmbuild ; then
|
if test -f /usr/bin/rpmbuild ; then
|
||||||
rpmbuild --nodeps \
|
rpmbuild $nodeps \
|
||||||
--define "extra_release $EXTRA_RELEASE" \
|
--define "extra_release $EXTRA_RELEASE" \
|
||||||
--define "_sourcedir `pwd`" \
|
--define "_sourcedir `pwd`" \
|
||||||
-ba --clean libvirt.spec
|
-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 -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
|
||||||
if test -f /usr/bin/rpmbuild ; then
|
if test -f /usr/bin/rpmbuild ; then
|
||||||
rpmbuild --nodeps \
|
rpmbuild $nodeps \
|
||||||
--define "extra_release $EXTRA_RELEASE" \
|
--define "extra_release $EXTRA_RELEASE" \
|
||||||
--define "_sourcedir `pwd`" \
|
--define "_sourcedir `pwd`" \
|
||||||
-ba --clean mingw-libvirt.spec
|
-ba --clean mingw-libvirt.spec
|
||||||
|
Loading…
Reference in New Issue
Block a user