From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Mon, 19 Apr 2010 15:05:16 +0000 (+0200)
Subject: check changetarget an all architectures
X-Git-Tag: obs_2.0~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6c7b4ed4221a804925da185a71e767cc2ec0beb;p=tools%2Fobs-build.git

check changetarget an all architectures
---

diff --git a/build b/build
index d6bb919..917c9db 100755
--- a/build
+++ b/build
@@ -76,7 +76,6 @@ PERSONALITY_SYSCALL=
 INCARNATION=
 DISTURL=
 LINKSOURCES=
-CHANGETARGET=
 OVERLAY=
 RSYNCSRC=
 RSYNCDEST=
@@ -1616,13 +1615,10 @@ for SPECFILE in "${SPECFILES[@]}" ; do
 	# extract optflags from configuration
 	getoptflags --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH" ${BUILD_DEBUG:+--debug} > $BUILD_ROOT/root/.rpmrc
 	test $BUILD_USER = abuild && cp -p $BUILD_ROOT/root/.rpmrc $BUILD_ROOT/home/abuild/.rpmrc
-	# case arm, extract changetarget
-	# this is restricted to arm to make sure it doesn't interfere with x86
-	if [ "$BUILD_ARCH" != "${BUILD_ARCH#arm}" ]; then
-	    echo "changing targetarch"
+	if test -z "$ABUILD_TARGET_ARCH"; then
 	    chmod a+x $BUILD_DIR/getchangetarget || cleanup_and_exit 1
-	    CHANGETARGET=$(getchangetarget --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH" )
-	    echo "NEW TARGET: $CHANGETARGET"
+	    ABUILD_TARGET_ARCH=$(getchangetarget --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH" )
+	    test -z "$ABUILD_TARGET_ARCH" || echo "changing target arch to $ABUILD_TARGET_ARCH"
 	fi
     fi
     if test -f $BUILD_ROOT/.spec.new ; then
@@ -1742,10 +1738,6 @@ for SPECFILE in "${SPECFILES[@]}" ; do
 		rpmbopts[${#rpmbopts[@]}]='--eval'
 		rpmbopts[${#rpmbopts[@]}]="%suse_insert_debug_package"
 	fi
-	if [ -n "$CHANGETARGET" ]; then
-		rpmbopts[${#rpmbopts[@]}]='--target'
-		rpmbopts[${#rpmbopts[@]}]="$CHANGETARGET"
-	fi
 	if [ -n "$RSYNCDONE" ] ; then
 		rpmbopts[${#rpmbopts[@]}]='--define'
 		rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1"