summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-17 17:18:27 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-17 17:18:27 +0000
commitbc1ce63c1d889add43c332e2645fd140f4f4fe62 (patch)
tree8947a9fcf764a971aa75de8e8d4b745e72ce5da8
parent1dd27ec870a6b1f590f692e1dd96a1eeffacd166 (diff)
downloadpoky-bc1ce63c1d889add43c332e2645fd140f4f4fe62.tar.gz
scripts/autobuild-moblin: Configuration fixups
-rwxr-xr-xscripts/poky-autobuild-moblin18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/poky-autobuild-moblin b/scripts/poky-autobuild-moblin
index afd85964be..6be69efbfd 100755
--- a/scripts/poky-autobuild-moblin
+++ b/scripts/poky-autobuild-moblin
@@ -2,7 +2,7 @@
2 2
3# Poky Automated Build Server Enviroment Setup Script 3# Poky Automated Build Server Enviroment Setup Script
4# 4#
5# Copyright (C) 2006-2007 OpenedHand Ltd. 5# Copyright (C) 2008 Intel
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
18# along with this program; if not, write to the Free Software 18# along with this program; if not, write to the Free Software
19# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 20
21SRVWORKDIR=/home/buildbot 21SRVWORKDIR=/home/rpurdie
22TARGETDIR=$SRVWORKDIR/autobuild-output 22TARGETDIR=$SRVWORKDIR/httpd/autobuild-output
23CURRDIR=`pwd` 23CURRDIR=`pwd`
24if [ "$CURRDIR" = "$SRVWORKDIR/poky/full-shihtzu/build" ]; then 24if [ "$CURRDIR" = "$SRVWORKDIR/poky/full-shihtzu/build" ]; then
25 ABTARGET="poky" 25 ABTARGET="poky"
@@ -43,7 +43,7 @@ fi
43if [ "xpreamble" = "x$1" ]; then 43if [ "xpreamble" = "x$1" ]; then
44 mkdir -p ./build/tmp/deploy/images 44 mkdir -p ./build/tmp/deploy/images
45 rm -f ./build/tmp/deploy/images/images-complete 45 rm -f ./build/tmp/deploy/images/images-complete
46 svn info > ./build/tmp/deploy/images/svninfo 46 #svn info > ./build/tmp/deploy/images/svninfo
47 exit 0 47 exit 0
48fi 48fi
49 49
@@ -55,9 +55,9 @@ POSTPROCESS=`which poky-autobuild-postprocess-moblin`
55if [ "xcomplete" = "x$1" ]; then 55if [ "xcomplete" = "x$1" ]; then
56 touch ./tmp/deploy/images/images-complete 56 touch ./tmp/deploy/images/images-complete
57 chmod a+w ./tmp/deploy/images/images-complete 57 chmod a+w ./tmp/deploy/images/images-complete
58 if [ "x$POSTPROCESS" != "x" ]; then 58 if [ "x$POSTPROCESS" != "x" -a -x "$POSTPROCESS" ]; then
59 cd .. 59 cd ..
60 $POSTPROCESS $ABTARGET $TARGETDIR 60 $POSTPROCESS $ABTARGET $TARGETDIR $BASEDIR
61 fi 61 fi
62 exit 0 62 exit 0
63fi 63fi
@@ -71,9 +71,9 @@ if [ ! -e "$CONFFILE" ]; then
71 echo 'PACKAGE_CLASSES = "package_ipk package_deb package_rpm"' > "$CONFFILE" 71 echo 'PACKAGE_CLASSES = "package_ipk package_deb package_rpm"' > "$CONFFILE"
72 echo 'BB_NUMBER_THREADS = "6"' >> "$CONFFILE" 72 echo 'BB_NUMBER_THREADS = "6"' >> "$CONFFILE"
73 echo 'PARALLEL_MAKE = "-j 6"' >> "$CONFFILE" 73 echo 'PARALLEL_MAKE = "-j 6"' >> "$CONFFILE"
74 echo "DL_DIR = \"$SRVWORKDIR/sources\"" >> "$CONFFILE" 74 echo "DL_DIR = \"$SRVWORKDIR/httpd/sources\"" >> "$CONFFILE"
75 echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE" 75 #echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE"
76 echo 'INHERIT += "poky-moblin-autobuilder-proxy-config"' >> "$CONFFILE" 76 #echo 'INHERIT += "poky-moblin-autobuilder-proxy-config"' >> "$CONFFILE"
77 if [ "$ABTARGET" = "darwin" ]; then 77 if [ "$ABTARGET" = "darwin" ]; then
78 echo 'PACKAGE_CLASSES += "package_tar"' >> "$CONFFILE" 78 echo 'PACKAGE_CLASSES += "package_tar"' >> "$CONFFILE"
79 echo "BBFILES += \"$CURRDIR/meta-darwin/packages/*/*.bb\"" >> "./conf/local.conf" 79 echo "BBFILES += \"$CURRDIR/meta-darwin/packages/*/*.bb\"" >> "./conf/local.conf"