[X2Go-Commits] [buildscripts] 01/01: first approach to build opensuse RPMs

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit f7895e3ef476561d859b43fe65025c1318594341
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 11 11:24:21 2014 +0200

    first approach to build opensuse RPMs
---
 bin/build-rpm-package        |   35 +++++++++++++++++++++++++----------
 home/.buildscripts/x2go.conf |    2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index c1efa60..d7e1cc7 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -37,6 +37,8 @@ REPOS_SERVER="packages.mydomain.org"
 PACKAGES_WITHOUT_OTHERMIRROR="keyring"
 GNUPGHOME=$HOME/.gnupg
 
+OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#VERSION#/repo/oss/suse/"
+
 test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; }
 
 PREFIX=$(echo `basename $0` | cut -d"-" -f1)
@@ -226,17 +228,30 @@ build_packages() {
 
 				if [ "x$SKIP_ARCH" != "xx86_64" ] || [ "$IS_NOARCH" = "yes" ]; then
 					rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
-					while [ -d ~mock/${l_DIST}-${l_CODENAME}-x86_64 ]; do
-						echo "Waiting for some other build to finish..."
-						sleep 30
-					done
-					if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then
-						rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
-						cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
+					if [ "x$PKGDIST" = "xopensuse"]; then
+						mkdir -p "/var/cache/obs-build/$PKGDIST/$l_DIST/$l_CODENAME/x86_64/"
+						OPENSUSE_DOWNLOAD_URL=$(echo "$OPENSUSE_DOWNLOAD_URL" | sed 's/#VERSION#/$l_DIST/')
+						if obs-build --repo "$OPENSUSE_DOWNLOAD_URL" \
+						             --root "/var/cache/obs-build/$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" \
+						             $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then
+							rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
+						else
+							rm -Rf "$TEMP_DIR"
+							exit -1
+						fi
 					else
-						cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
-						rm -Rf "$TEMP_DIR"
-						exit -1
+						while [ -d ~mock/${l_DIST}-${l_CODENAME}-x86_64 ]; do
+							echo "Waiting for some other build to finish..."
+							sleep 30
+						done
+						if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then
+							rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
+							cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
+						else
+							cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
+							rm -Rf "$TEMP_DIR"
+							exit -1
+						fi
 					fi
 				fi
 				if [ "x$SKIP_ARCH" != "xi386" ] && [ "$IS_NOARCH" != "yes" ]; then
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 1edb807..8c4519a 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -14,7 +14,7 @@ RPMEMAIL=git-admin at x2go.org
 RPMFULLNAME="X2go Git Administrator"
 GPG_KEY="F4A7678C9C6B0B2B"
 RPM_DISTS_SUPPORTED="fedora epel"
-RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,rawhide epel:6,7"}
+RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,rawhide epel:6,7 sles:11 opensuse:12.3,13.1"}
 RPM_REPOS_BASE=/srv/sites/x2go.org/packages/
 
 COMPONENT_MAIN="main"

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git