diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/poky-autobuild-postprocess | 6 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 4 | ||||
| -rw-r--r-- | scripts/pokyABConfig.py | 14 |
3 files changed, 14 insertions, 10 deletions
diff --git a/scripts/poky-autobuild-postprocess b/scripts/poky-autobuild-postprocess index 2e9a9259d..cbe5203fb 100755 --- a/scripts/poky-autobuild-postprocess +++ b/scripts/poky-autobuild-postprocess @@ -70,7 +70,7 @@ if [ "x$ABTARGET" = "xpoky" ]; then `readlink images/zImage-spitz.bin` `readlink images/zImage-nokia800.bin` `readlink images/bzImage-qemux86.bin` - `readlink images/bzImage-eee901.bin` + `readlink images/bzImage-netbook.bin` `readlink images/zImage-htcuniversal.bin` `readlink images/zImage-mx31litekit.bin` `readlink images/zImage-mx31ads.bin` @@ -86,8 +86,8 @@ if [ "x$ABTARGET" = "xpoky" ]; then updater.sh.c7x0 updater.sh.spitz gnu-tar - poky-image-netbook-live-eee901-*.hddimg - poky-image-minimal-live-eee901-*.hddimg + poky-image-live-netbook-*.hddimg + poky-image-minimal-live-netbook-*.hddimg poky-image-sato-akita-*.rootfs.summary.jffs2 poky-image-sato-c7x0-*.rootfs.jffs2 poky-image-sato-spitz-*.rootfs.tar.gz diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index b805abe2d..6acc7a390 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -33,6 +33,7 @@ fi BBDIR="$OEROOT/bitbake$BBEXTRA/" PKGDIR="$OEROOT/meta/" +PKGDIR_MOBLIN="$OEROOT/meta-moblin/" BUILDDIR="$OEROOT/$BDIR/" MSG='' @@ -59,6 +60,9 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then fi BBPATH=$BBDIR +if test x"$BBDIR" != x"$PKGDIR_MOBLIN"; then + BBPATH=$PKGDIR_MOBLIN:$BBPATH +fi if test x"$BBDIR" != x"$PKGDIR"; then BBPATH=$PKGDIR:$BBPATH fi diff --git a/scripts/pokyABConfig.py b/scripts/pokyABConfig.py index 30e89c8cf..27fe5e635 100644 --- a/scripts/pokyABConfig.py +++ b/scripts/pokyABConfig.py @@ -64,12 +64,12 @@ runImage(f3, 'beagleboard', 'poky-image-sato') runImage(f3, 'qemux86', 'poky-image-minimal') runImage(f3, 'qemux86', 'poky-image-sato') runImage(f3, 'qemux86', 'poky-image-sdk') -runImage(f3, 'eee901', 'poky-image-minimal') -runImage(f3, 'eee901', 'poky-image-minimal-live') -runImage(f3, 'eee901', 'poky-image-sato') -runImage(f3, 'eee901', 'poky-image-sato-live') -runImage(f3, 'eee901', 'poky-image-netbook-live') -runImage(f3, 'eee901', 'poky-image-sdk') +runImage(f3, 'netbook', 'poky-image-minimal') +runImage(f3, 'netbook', 'poky-image-minimal-live') +runImage(f3, 'netbook', 'poky-image-sato') +runImage(f3, 'netbook', 'poky-image-sato-live') +runImage(f3, 'netbook', 'poky-image-live') +runImage(f3, 'netbook', 'poky-image-sdk') runImage(f3, 'bootcdx86', 'poky-image-sato-cd') defaultenv['POKYLIBC'] = 'uclibc' runImage(f3, 'cm-x270', 'poky-image-minimal-mtdutils') @@ -87,7 +87,7 @@ runImage(f4, 'qemuarm', 'world') runImage(f4, 'qemux86', 'poky-image-sdk') runImage(f4, 'qemux86', 'world') runImage(f4, 'omap-3430ldp', 'poky-image-sato') -runImage(f4, 'eee901', 'poky-image-sato-live') +runImage(f4, 'netbook', 'poky-image-sato-live') runComplete(f4) from buildbot.process import step, factory |