Changeset 586

Timestamp:

Sep 2, 2002, 4:41:47 PM (22 years ago)

Author:

pstorz

Message:

Anpassungen um auch die source-rpms nutzen zu können:

• .dif und .init Dateien werden mit auf Wotan kopiert
• tar.gz und tar.bz2 werden nun unterstuetzt
• -0 Version auf -* gesetzt, damit die srpms, deren Version automatisch hochgezählt wird, beim zurückkopieren auch gefunden werden.

File:

• trunk/technical/common/build/build.sh (modified) (6 diffs)

trunk/technical/common/build/build.sh

@@ -1 +1 @@
 #!/bin/bash
 # Remote build script (iboernig@suse.de)
-# $Id: build.sh,v 1.2 2002/08/29 15:06:49 stephand Exp $
+# $Id: build.sh,v 1.3 2002/09/02 14:41:47 pstorz Exp $
 #
 # Kurze Featuritis:
@@ -34 +34 @@
 [ -z "$BUILD_DIST" ] && BUILD_DIST="${OS_TYPE}${OS_VER}-$ARCH"
 [ -z "$BUILD_ROOT" ] && BUILD_ROOT="/abuild/buildsystem.$BUILDHOST.$USER.$BUILD_DIST.smartclient"
+[ -z "$BUILD_PREPARE_SPEC" ] && BUILD_PREPARE_SPEC="no"
 
 [ -z $DEST_DIR ] && DEST_DIR="/tmp/smartclient_build"
@@ -41 +42 @@
 
 SPECFILE=$(ls *.spec | awk '{print $1}')
-TARFILE=$(ls *.tar.gz | awk '{print $1}')
+TARFILE=$(ls  *.tar.[gb]z*| awk '{print $1}')
+DIFFILES=$(ls *.dif | awk '{print $1}')
+
+# sonstige files die gebraucht werden
+RESTFILES=$(ls *.init | awk '{print $1}') # fuer srpm inetd
 
 PACKAGE=$(awk '/^Name:/ {print $2}' <$SPECFILE)
@@ -56 +61 @@
                         mkdir -p ${BUILDTEMP}/${ARCH}/${OS_TYPE}/${OS_VER}"
 
-scp -oProtocol=$SSH_VERSION $TARFILE $SPECFILE ${FQBUILDHOST}:${BUILDTEMP}/src/${PACKAGE}-${VERSION}
+scp -oProtocol=$SSH_VERSION $TARFILE $SPECFILE $DIFFILES $RESTFILES ${FQBUILDHOST}:${BUILDTEMP}/src/${PACKAGE}-${VERSION}
 
 # create buildscript
@@ -66 +71 @@
 export BUILD_ROOT=$BUILD_ROOT
 export BUILD_DIST=$BUILD_DIST
+export BUILD_PREPARE_SPEC=$BUILD_PREPARE_SPEC
+
+echo "BUILD_PREPARE_SPEC ist $BUILD_PREPARE_SPEC";
+
+
 cd ~${BUILDUSER}/${BUILDTEMP}/src/${PACKAGE}-${VERSION}
-build $BUILD_MODE       --prefer-rpms ~${BUILDUSER}/${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER 
+build $BUILD_MODE       --prefer-rpms ~${BUILDUSER}/${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER 
 EOF
 
@@ -79 +89 @@
         . ~$BUILDUSER/${BUILDTEMP}/src/${PACKAGE}-${VERSION}/buildscript
 ssh -oProtocol=$SSH_VERSION ${FQBUILDHOST} \
-        cp ${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-0.${BUILDARCH}.rpm ${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER/
+        cp ${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-*.${BUILDARCH}.rpm ${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER/
 
 mkdir -p ${DEST_DIR}/src
-scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/SRPMS/${PACKAGE}-${VERSION}-0.src.rpm ${DEST_DIR}/src
+scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/SRPMS/${PACKAGE}-${VERSION}-*.src.rpm ${DEST_DIR}/src
 
 mkdir -p ${DEST_DIR}/$ARCH/$OS_TYPE/$OS_VER
-scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-0.${BUILDARCH}.rpm ${DEST_DIR}/$ARCH/$OS_TYPE/$OS_VER
+scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-*.${BUILDARCH}.rpm ${DEST_DIR}/$ARCH/$OS_TYPE/$OS_VER
 
 echo "Build of ${PACKAGE} completed!"