[libvirt] [sandbox PATCH v2 0/4] Remove Test::AutoBuild leftovers
Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00220.html Andrea Bolognani (4): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to MinGW builds prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release} autobuild.sh | 71 ----------------------------------------- libvirt-sandbox.spec.in | 2 +- prepare-release.sh | 39 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 72 deletions(-) delete mode 100755 autobuild.sh create mode 100755 prepare-release.sh -- 2.17.0
The script was originally used by the Test::AutoBuild project to perform periodic automatic builds; however, that effort has been abandoned a long time ago, and these days libvirt-sandbox CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], where build recipes are maintained separately from the projects themselves. The script is still used to prepare releases, so it can't be dropped from the repository: rename it so that its purpose is more clearly communicated instead. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- autobuild.sh => prepare-release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename autobuild.sh => prepare-release.sh (100%) diff --git a/autobuild.sh b/prepare-release.sh similarity index 100% rename from autobuild.sh rename to prepare-release.sh -- 2.17.0
The MinGW spec file was never included in the git repository to begin with. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- prepare-release.sh | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/prepare-release.sh b/prepare-release.sh index c176fea..1fee11f 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -46,26 +46,3 @@ if [ -f /usr/bin/rpmbuild ]; then fi exit 0 -if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then - make distclean - - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="i686-pc-mingw32-gcc" \ - ../configure \ - --build=$(uname -m)-pc-linux \ - --host=i686-pc-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" - - make - make install - - #set -o pipefail - #make check 2>&1 | tee "$RESULTS" - - if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean mingw32-libvirt-sandbox.spec - fi -fi -- 2.17.0
They are misleading, and no longer relevant anyway. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- prepare-release.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/prepare-release.sh b/prepare-release.sh index 1fee11f..c8fd2b5 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -5,7 +5,6 @@ set -v # Make things clean. test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} test -f Makefile && make -k distclean || : @@ -13,7 +12,7 @@ rm -rf build mkdir build cd build -../autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT \ +../autogen.sh --prefix=$HOME/builder \ --enable-gtk-doc make @@ -31,12 +30,8 @@ test "$st" = 0 rm -f *.tar.gz make dist -if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" -else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" -fi +NOW=`date +"%s"` +EXTRA_RELEASE=".$USER$NOW" if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps \ -- 2.17.0
It was mainly meant to be used for automatic builds through Test::AutoBuild, so it can be removed now. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt-sandbox.spec.in | 2 +- prepare-release.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libvirt-sandbox.spec.in b/libvirt-sandbox.spec.in index 0374d9e..4e020de 100644 --- a/libvirt-sandbox.spec.in +++ b/libvirt-sandbox.spec.in @@ -16,7 +16,7 @@ Name: @PACKAGE@ Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ diff --git a/prepare-release.sh b/prepare-release.sh index c8fd2b5..2be25c2 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -30,12 +30,8 @@ test "$st" = 0 rm -f *.tar.gz make dist -NOW=`date +"%s"` -EXTRA_RELEASE=".$USER$NOW" - if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean libvirt-sandbox.spec fi -- 2.17.0
On Mon, 2018-05-07 at 16:20 +0200, Andrea Bolognani wrote:
Changes from [v1]:
* rename the script instead of dropping it;
* perform some further clean ups.
[v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00220.html
Andrea Bolognani (4): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to MinGW builds prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release}
autobuild.sh | 71 ----------------------------------------- libvirt-sandbox.spec.in | 2 +- prepare-release.sh | 39 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 72 deletions(-) delete mode 100755 autobuild.sh create mode 100755 prepare-release.sh
Ping? This is fairly trivial stuff, which I'd love to get off my queue :) -- Andrea Bolognani / Red Hat / Virtualization
On Tue, May 15, 2018 at 03:00:15PM +0200, Andrea Bolognani wrote:
On Mon, 2018-05-07 at 16:20 +0200, Andrea Bolognani wrote:
Changes from [v1]:
* rename the script instead of dropping it;
* perform some further clean ups.
The changes look reasonable to me. Reviewed-by: Erik Skultety <eskultet@redhat.com>
On Wed, 2018-05-16 at 15:05 +0200, Erik Skultety wrote:
On Tue, May 15, 2018 at 03:00:15PM +0200, Andrea Bolognani wrote:
On Mon, 2018-05-07 at 16:20 +0200, Andrea Bolognani wrote:
Changes from [v1]:
* rename the script instead of dropping it;
* perform some further clean ups.
The changes look reasonable to me.
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Pushed now, thanks :) -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Erik Skultety