[virt-tools-list] [PATCH-v5.5 4/5] make autobuild.sh work

Cole Robinson crobinso at redhat.com
Wed Apr 10 21:49:47 UTC 2013


On 04/09/2013 03:19 PM, Gene Czarcinski wrote:
> There a some problems with autobuild.sh and this patch addresses
> them:
> 
> 1. "python setup.py install" needs to use --root= instead
> of --prefix=
> 
> 2. For the rpmbuild, use dist/*.tar.gz instead of *.tar.gz
> 
> 3. Add "export AUTOBUILD_OVERRIDE_VERSION=y" so that if
> the version-id changes are applied, a simpler version-id
> is used for autobuild.
> 
> 4. Assume tests are fixed and enable running
> "python setup.py test"
> .
> Signed-off-by: Gene Czarcinski <gene at czarc.net>
> ---
>  autobuild.sh | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/autobuild.sh b/autobuild.sh
> index baa9482..c17521d 100755
> --- a/autobuild.sh
> +++ b/autobuild.sh
> @@ -9,10 +9,16 @@ if [ -z "$AUTOBUILD_INSTALL_ROOT" ] ; then
>      exit 1
>  fi
>  
> +rm -rf MANIFEST dist/*
> +
> +# support version-id changes
> +export AUTOBUILD_OVERRIDE_VERSION=y
> +
> +python setup.py sdist
> +
>  python setup.py build
>  python setup.py test
> -python setup.py install --prefix=$AUTOBUILD_INSTALL_ROOT
> -python setup.py sdist
> +python setup.py install --root=$AUTOBUILD_INSTALL_ROOT
>  
>  which /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0
>  
> @@ -22,5 +28,5 @@ else
>      NOW=`date +"%s"`
>      EXTRA_RELEASE=".$USER$NOW"
>  fi
> -rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
> +rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean dist/*.tar.gz
>  
> 

Thanks, pushed now.

- Cole




More information about the virt-tools-list mailing list