summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-autobuild-postprocess6
-rwxr-xr-xscripts/poky-env-internal4
-rw-r--r--scripts/pokyABConfig.py14
3 files changed, 14 insertions, 10 deletions
diff --git a/scripts/poky-autobuild-postprocess b/scripts/poky-autobuild-postprocess
index 2e9a9259d3..cbe5203fb5 100755
--- a/scripts/poky-autobuild-postprocess
+++ b/scripts/poky-autobuild-postprocess
@@ -70,7 +70,7 @@ if [ "x$ABTARGET" = "xpoky" ]; then
70 `readlink images/zImage-spitz.bin` 70 `readlink images/zImage-spitz.bin`
71 `readlink images/zImage-nokia800.bin` 71 `readlink images/zImage-nokia800.bin`
72 `readlink images/bzImage-qemux86.bin` 72 `readlink images/bzImage-qemux86.bin`
73 `readlink images/bzImage-eee901.bin` 73 `readlink images/bzImage-netbook.bin`
74 `readlink images/zImage-htcuniversal.bin` 74 `readlink images/zImage-htcuniversal.bin`
75 `readlink images/zImage-mx31litekit.bin` 75 `readlink images/zImage-mx31litekit.bin`
76 `readlink images/zImage-mx31ads.bin` 76 `readlink images/zImage-mx31ads.bin`
@@ -86,8 +86,8 @@ if [ "x$ABTARGET" = "xpoky" ]; then
86 updater.sh.c7x0 86 updater.sh.c7x0
87 updater.sh.spitz 87 updater.sh.spitz
88 gnu-tar 88 gnu-tar
89 poky-image-netbook-live-eee901-*.hddimg 89 poky-image-live-netbook-*.hddimg
90 poky-image-minimal-live-eee901-*.hddimg 90 poky-image-minimal-live-netbook-*.hddimg
91 poky-image-sato-akita-*.rootfs.summary.jffs2 91 poky-image-sato-akita-*.rootfs.summary.jffs2
92 poky-image-sato-c7x0-*.rootfs.jffs2 92 poky-image-sato-c7x0-*.rootfs.jffs2
93 poky-image-sato-spitz-*.rootfs.tar.gz 93 poky-image-sato-spitz-*.rootfs.tar.gz
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index b805abe2d5..6acc7a3905 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -33,6 +33,7 @@ fi
33 33
34BBDIR="$OEROOT/bitbake$BBEXTRA/" 34BBDIR="$OEROOT/bitbake$BBEXTRA/"
35PKGDIR="$OEROOT/meta/" 35PKGDIR="$OEROOT/meta/"
36PKGDIR_MOBLIN="$OEROOT/meta-moblin/"
36BUILDDIR="$OEROOT/$BDIR/" 37BUILDDIR="$OEROOT/$BDIR/"
37MSG='' 38MSG=''
38 39
@@ -59,6 +60,9 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then
59fi 60fi
60 61
61BBPATH=$BBDIR 62BBPATH=$BBDIR
63if test x"$BBDIR" != x"$PKGDIR_MOBLIN"; then
64 BBPATH=$PKGDIR_MOBLIN:$BBPATH
65fi
62if test x"$BBDIR" != x"$PKGDIR"; then 66if test x"$BBDIR" != x"$PKGDIR"; then
63 BBPATH=$PKGDIR:$BBPATH 67 BBPATH=$PKGDIR:$BBPATH
64fi 68fi
diff --git a/scripts/pokyABConfig.py b/scripts/pokyABConfig.py
index 30e89c8cfb..27fe5e6354 100644
--- a/scripts/pokyABConfig.py
+++ b/scripts/pokyABConfig.py
@@ -64,12 +64,12 @@ runImage(f3, 'beagleboard', 'poky-image-sato')
64runImage(f3, 'qemux86', 'poky-image-minimal') 64runImage(f3, 'qemux86', 'poky-image-minimal')
65runImage(f3, 'qemux86', 'poky-image-sato') 65runImage(f3, 'qemux86', 'poky-image-sato')
66runImage(f3, 'qemux86', 'poky-image-sdk') 66runImage(f3, 'qemux86', 'poky-image-sdk')
67runImage(f3, 'eee901', 'poky-image-minimal') 67runImage(f3, 'netbook', 'poky-image-minimal')
68runImage(f3, 'eee901', 'poky-image-minimal-live') 68runImage(f3, 'netbook', 'poky-image-minimal-live')
69runImage(f3, 'eee901', 'poky-image-sato') 69runImage(f3, 'netbook', 'poky-image-sato')
70runImage(f3, 'eee901', 'poky-image-sato-live') 70runImage(f3, 'netbook', 'poky-image-sato-live')
71runImage(f3, 'eee901', 'poky-image-netbook-live') 71runImage(f3, 'netbook', 'poky-image-live')
72runImage(f3, 'eee901', 'poky-image-sdk') 72runImage(f3, 'netbook', 'poky-image-sdk')
73runImage(f3, 'bootcdx86', 'poky-image-sato-cd') 73runImage(f3, 'bootcdx86', 'poky-image-sato-cd')
74defaultenv['POKYLIBC'] = 'uclibc' 74defaultenv['POKYLIBC'] = 'uclibc'
75runImage(f3, 'cm-x270', 'poky-image-minimal-mtdutils') 75runImage(f3, 'cm-x270', 'poky-image-minimal-mtdutils')
@@ -87,7 +87,7 @@ runImage(f4, 'qemuarm', 'world')
87runImage(f4, 'qemux86', 'poky-image-sdk') 87runImage(f4, 'qemux86', 'poky-image-sdk')
88runImage(f4, 'qemux86', 'world') 88runImage(f4, 'qemux86', 'world')
89runImage(f4, 'omap-3430ldp', 'poky-image-sato') 89runImage(f4, 'omap-3430ldp', 'poky-image-sato')
90runImage(f4, 'eee901', 'poky-image-sato-live') 90runImage(f4, 'netbook', 'poky-image-sato-live')
91runComplete(f4) 91runComplete(f4)
92 92
93from buildbot.process import step, factory 93from buildbot.process import step, factory