Changeset 733

Timestamp:

Jan 26, 2009, 4:33:42 PM (16 years ago)

Author:

joergs

Message:

users /usr/local/bin/buildscript for sudo instead of sudo su -

Location:

trunk/technical/common/build

Files:

• README.sles8 (deleted)
• build.sh (modified) (4 diffs)
• buildscript (copied) (copied from branches/Debeka/SC-03_01_add_NAH_Branch_Debeka/technical/common/build/buildscript )

trunk/technical/common/build/build.sh

@@ -21 +21 @@
 # the rest is controlled by environment variables
 #
-# build.sh uses sudo su. /etc/sudoers needs a line like:
-# %users  ALL=(ALL)       NOPASSWD: /bin/su
-# for automatic building
+# build.sh uses sudo. /etc/sudoers needs a line like:
+# %users  ALL=(ALL)       NOPASSWD: /usr/local/bin/buildscript
+# for automatic building (create a symlink or copy the file,
+# see also the Variable BUILDSCRIPT and content of this script)
 #
 # return codes:
@@ -37 +38 @@
 
 
-
+# set LANG to default (english)
+# required for SVN
+export LC_ALL=C
 
 CONFIG_FILE=/usr/local/etc/build
+BUILDSCRIPT=buildscript
 BUILD_CMD=build
 BUILDUSER=$USER
@@ -50 +54 @@
 [ -z $DEST_DIR ] && DEST_DIR="/tmp/build.$BUILDUSER"
 BUILDTEMP=$DEST_DIR/buildsrc/
-BUILDSCRIPT=$BUILDTEMP/buildscript.$$
+#BUILDSCRIPT=$BUILDTEMP/buildscript.$$
+BUILDVARS=$BUILDTEMP/build.vars
 
 [ -z "$BUILD_USES_SVN" ] && BUILD_USES_SVN="yes"
@@ -216 +221 @@
 fi
 
-# create buildscript
-cat > $BUILDSCRIPT <<EOF
-#!/bin/bash
-# local buildscript
-export BUILD_ROOT=$BUILD_ROOT
-export BUILD_DIST=$BUILD_DIST
-export BUILD_RPMS=${DEST_DIR}/${BUILD_DIST}:$BUILD_RPMS
-export BUILD_PREPARE_SPEC=$BUILD_PREPARE_SPEC
-
-cd ${BUILDTEMP}/src/${PACKAGE}
-$BUILD_CMD $BUILD_MODE
+# # create buildscript
+# cat > $BUILDSCRIPT <<EOF
+# #!/bin/bash
+# # local buildscript
+# export BUILD_ROOT=$BUILD_ROOT
+# export BUILD_DIST=$BUILD_DIST
+# export BUILD_RPMS=${DEST_DIR}/${BUILD_DIST}:$BUILD_RPMS
+# export BUILD_PREPARE_SPEC=$BUILD_PREPARE_SPEC
+# 
+# cd ${BUILDTEMP}/src/${PACKAGE}
+# $BUILD_CMD $BUILD_MODE
+# EOF
+# 
+# chmod a+x $BUILDSCRIPT
+# sudo /bin/su -c $BUILDSCRIPT
+# rm -f $BUILDSCRIPT
+
+# create file for buildvars (see $BUILDSCRIPT)
+cat > $BUILDVARS <<EOF
+# Variables for build-Prozess (export is needed in buildscript)
+BUILD_ROOT=$BUILD_ROOT
+BUILD_DIST=$BUILD_DIST
+BUILD_RPMS=${DEST_DIR}/${BUILD_DIST}:$BUILD_RPMS
+
+# Variables for execute the build-proggy
+BUILD_MODE="$BUILD_MODE"
+BUILD_PLACE=${BUILDTEMP}/src/${PACKAGE}
+EXTRA_RPMS="$EXTRA_RPMS"
 EOF
 
-chmod a+x $BUILDSCRIPT
-sudo su -c $BUILDSCRIPT
-rm -f $BUILDSCRIPT
+sudo $BUILDSCRIPT $BUILDVARS
+#rm -f $BUILDVARS
+
+
 
 mkdir -p ${DEST_DIR}/src