summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-autobuild-moblin8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/poky-autobuild-moblin b/scripts/poky-autobuild-moblin
index 0fa2ba0f0a..afd85964be 100755
--- a/scripts/poky-autobuild-moblin
+++ b/scripts/poky-autobuild-moblin
@@ -49,7 +49,7 @@ fi
49 49
50BDIR="build" 50BDIR="build"
51. ./scripts/poky-env-internal 51. ./scripts/poky-env-internal
52BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE GIT_CORE_CONFIG GIT_PROXY_IGNORE_1 GIT_PROXY_HOST GIT_PROXY_PORT" 52BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE"
53POSTPROCESS=`which poky-autobuild-postprocess-moblin` 53POSTPROCESS=`which poky-autobuild-postprocess-moblin`
54 54
55if [ "xcomplete" = "x$1" ]; then 55if [ "xcomplete" = "x$1" ]; then
@@ -68,12 +68,12 @@ if [ ! -e "$CONFFILE" ]; then
68 if [ ! -d "./conf" ]; then 68 if [ ! -d "./conf" ]; then
69 mkdir -p "./conf" 69 mkdir -p "./conf"
70 fi 70 fi
71 echo 'PACKAGE_CLASSES = "package_ipk package_deb"' > "$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/sources\"" >> "$CONFFILE"
75 echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE" 75 echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE"
76 echo 'GIT_PROXY_COMMAND=poky-git-proxy-socks-command' >> "$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"
@@ -84,6 +84,8 @@ if [ ! -e "$CONFFILE" ]; then
84 fi 84 fi
85fi 85fi
86 86
87BBPATH=$SRVWORKDIR/localmeta:$BBPATH
88
87if [ "$ABTARGET" = "darwin" ]; then 89if [ "$ABTARGET" = "darwin" ]; then
88 BBPATH=$CURRDIR/meta-darwin:$BBPATH 90 BBPATH=$CURRDIR/meta-darwin:$BBPATH
89fi 91fi