Commit graph

61 commits

Author SHA1 Message Date
Scott Garman
9c740e0425 runqemu: improve auto-detection of rootfs filenames
This refactors the way rootfs filenames are auto-detected when you
run the runqemu script without an explicit rootfs filename argument.
It allows the script to use rootfs files generated by hob, and when
there are mutliple rootfs files to choose from, it will pick the
most recently created one.

Fixes [YOCTO #1437].

(From OE-Core rev: 094453f443ed592d814dfb4182a0a02f0a2552e4)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-09 18:42:05 +01:00
Richard Purdie
32bb9c3184 imagetest-qemu/runqueue: Since we no longer support BUILDDIR, use TMPDIR
Commit 993672fa2739794a6dd0dbd7bb232fa60522b897 removed the BUILDDIR
support from runqueue which broke the imagetest-qemu integration. We now
therefore need to set TMPDIR and pass this through the environment to
ensure the runqueue script finds the right locations without running
bitbake directly.

This patch also adds a sleep to the qemu command in the error case so that
this remains on the screen for a period of time so the user can see errors
more easily.

This change unbreaks automated testing failures on the autobuilder.

(From OE-Core rev: de470333dbdeea444199340e4cd458c13fed6a5a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-09 18:39:26 +01:00
Scott Garman
fa45552688 runqemu: standardize ability to specify custom qemu/kenel boot options
The old manner of specifying custom options to QEMU in this script
using angle brackets was a frequent source of confusion. Meanwhile,
Otavio Salvador added a decent method of specifying custom kernel
boot options to this script. This patch documents the bootparams
option and adds a similar way of specifying custom QEMU options
using qemuparams="".

This fixes [YOCTO #1019]

(From OE-Core rev: 1038df14a96d789b3f9e9e1692305ba1fea67886)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-05 20:25:45 +01:00
Liming Wang
8a8a3b3905 scripts/runqemu: disable unfs boot mode for qemuppc
Because unfs boot mode is unstable for qemuppc, disable
it temporarily.

(From OE-Core rev: 74ff1bc8c248824116ba4b787b10fa6ee0c13ce1)

Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-29 13:48:03 +01:00
Otavio Salvador
6f5066a3a0 scripts/runqemu: add support to pass bootparams to kernel
(From OE-Core rev: 4a2d3cfeeef4de6da1301c65033fa251538cddc9)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:34 -07:00
Anders Darander
1927021c78 scripts/runqemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

(From OE-Core rev: 66e34066a0ac71f4212824b1e6353a4d323f4e21)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:19 -07:00
Khem Raj
0350be9458 scripts/runqemu: Make it run on ubuntu 11.10
location of libGL has moved in ubuntu 11.10
so we look for it in the new locations

(From OE-Core rev: 8d80918995a15663db7cc9c0683d45ee8ba7d45c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-11 19:22:06 +01:00
Khem Raj
68bd81506f scripts/runqemu: grep for line beginning with TMPDIR
Currently the grep regexp matches any occurance of
'TMPDIR=' but if you have another variable defined
e.g. OE_BUILD_TMPDIR=xxx then that gets picked up
too.

$ bitbake -e | grep TMPDIR=\"
TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc"
OE_BUILD_TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x"

So we become a bit more stringent and look for
line starting with TMPDIR

$ bitbake -e | grep ^TMPDIR=\"
TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc"

make sure that it greps
only TMPDIR=xxx occurance and not values of other variables
whose names happens to end with TMPDIR

(From OE-Core rev: 12ddf6c6a7559d97d9b8f84fcc89ed02e30df85d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-02 14:32:10 +01:00
Scott Garman
3fddac4ee9 runqemu: report error if TMPDIR cannot be determined
Invoking runqemu outside of the build directory for an
in-tree setup results in an empty TMPDIR because bitbake -e
cannot be run to find it.

A symptom of this problem is running runqemu and getting the
following error:

Error: Unable to find tunctl binary in <directory>

Catch this case and report the error to the user.

This fixes [YOCTO #1278]

(From OE-Core rev: ab5544ac801a976b56468ade0f5d2e95c11feb87)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-25 12:54:34 +01:00
Nitin A Kamble
d591e696b2 scripts/runqemu: enable btrfs
(From OE-Core rev: 45689bbd46b0bb8e66b7c0ff7cc3321e5eef5b5f)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-30 20:56:36 +01:00
Anders Darander
81d14f5629 runqemu: take TMPDIR from bitbake
The old standard of using /home/anders/openembedded-core/build/tmp as TMPDIR do not work any longer,
as - is appended to the real TMPDIR. Thus, always take TMPDIR from
bitbake, unless TMPDIR is set in the environment.

(From OE-Core rev: 993672fa2739794a6dd0dbd7bb232fa60522b897)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-14 15:28:25 +01:00
Richard Purdie
65f4b65410 Further cleanup of various poky references
(From OE-Core rev: fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:16 +01:00
Richard Purdie
e7126c1e53 Replace POKY_KVM_WIKI -> YOCTO_KVM_WIKI
(From OE-Core rev: 416e76102fdef606a0459351b85d4f7b30729114)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00
Richard Purdie
7469527855 POKY_NATIVE_SYSROOT -> OECORE_NATIVE_SYSROOT
(From OE-Core rev: c056aeaa13549b404088e3d465f3b03443e5ab88)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00
Richard Purdie
6e95cb246f Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00
Richard Purdie
08127d444e Rename poky-qemu to runqemu
(From OE-Core rev: 7687d91f73f4a116593315b3b1488ac3f0904905)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:29 +01:00
Scott Garman
0f973ed665 Merge runqemu features into poky-qemu
This merges the functionality of the runqemu script into poky-qemu.
It also removes the requirement to order command line args to poky-qemu
in any particular order.

This fixes a slew of runqemu-related bugs by making the runqemu script
obsolete (and fixing the issues in the new poky-qemu), including
[BUGID #294] [BUGID #295] [BUGID #371] and [BUGID #324].

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:57:34 +01:00
Richard Purdie
f7f044c220 scripts/runqemu: Drop broken toolchain symlink code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-10 10:45:55 +01:00
Saul Wold
8cbf96aeaf runqemu: add poky-image-basic and poky-image-lsb to recognized images
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-02 09:50:48 +01:00
Scott Garman
d7d803fa1c poky-qemu-internal: fix broken call to poky-qemu-ifup
The poky-qemu-ifup script now requires a path to the native
sysroot as an argument. This fixes a case where the argument
was missing.

Also, set up NATIVE_SYSROOT_DIR when running runqemu.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-08-20 16:20:12 +01:00
Joshua Lock
fa8c028fd0 scripts: add qemux86-64 support to the qemu scripts
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-08-02 17:54:20 +01:00
Richard Purdie
c2f71a86f5 poky-env-internal/runqemu: Move BUILD_SYS handling which is runqemu specific into runqemu
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-22 13:14:24 +01:00
Saul Wold
0c3b1aa0a5 scripts/runqemu: Path fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-21 21:49:09 +01:00
Joshua Lock
971907567c Enable build dir outside of the poky directory
You need to first set up the build directory by sourcing the poky build script,
after that builds can be run in that directory so long as bitbake is in $PATH
removing the need to source the init script for each build.

i.e:
$ . poky-init-build-env ~/my-build
$ bitbake some-image
<<later, in a different shell>>
$ cd ~/my-build
$ export PATH=/path/to/bitbake/bin:$PATH
$ bitbake an-image

This patch also removes use of OEROOT in recipes, etc.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-07-21 15:39:53 +01:00
Bruce Ashfield
d39ae18df2 qemu/mips: arrange for vmlinux to be bootable
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-07-19 11:59:51 -04:00
Bruce Ashfield
21949128eb qemu-scripts: Add support for mips and powerpc machines, update qemuarm
For mips, the malta platform emulates a cirrus chipset. With the udpated
2.6.34 kernel options, we can now enable framebuffer boot for
the qemumips platform.

We need to pass a valid cpu (603e) and do a -nographic boot to
make it all the way to a prompt so graphics is disabled for now
for ppc.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-07-15 11:19:10 +01:00
Joshua Lock
2e0e24e849 scripts: Fix setting up links to cc and gcc in runqemu
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-09 17:32:01 +01:00
Joshua Lock
6458da896f Fix references to CROSS_DIR now that it has been removed
CROSS_DIR is no longer removed so fix up classes, packages and documentation
which refer to it.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-04-28 16:47:14 +01:00
Joshua Lock
7b41d2b3d1 scripts/runqemu: Fix some typos
Fix typo in help message (we default to ext3 not ext2 now)
and a typo whereby moblin-image-sdk wouldn't be autofound.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-01-14 13:42:16 +00:00
Richard Purdie
b6b45ca538 runqemu: staging -> sysroots
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-25 14:53:37 +00:00
Richard Purdie
de687629d8 scripts: Update qemux86 to use the vmmouse driver, not wacom and find moblin images
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-10 12:15:48 +01:00
Richard Purdie
e121f9eb59 scripts/runqemu: Factor image location code into a shell function 2009-01-21 11:35:01 +00:00
Richard Purdie
eae7eb5bd5 scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images 2009-01-05 16:00:31 +00:00
Ross Burton
e02398f08d Fix runqemu to handle clearing args
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4328 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-24 14:50:41 +00:00
Richard Purdie
faf55131c9 scripts: Add support for nokia800 to runqemu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4226 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-10 09:50:54 +00:00
Richard Purdie
36ed211c35 scripts: Mark qemu scripts as bash specific to avoid dash problems and error if a suitable qemu binary can't be found
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3859 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-22 16:23:33 +00:00
Richard Purdie
b9c9360d80 scripts/runqemu: Append to CROSSPATH after creating symlinks
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3668 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-04 19:30:14 +00:00
Richard Purdie
5bc44c708b scripts: Fix sdk compiler location handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3652 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-31 18:45:32 +00:00
Richard Purdie
d0dae3b616 scripts: Always try to start distccd, improve distccd cleanup, add SDK directory to the search path so any cross compiler installed in /usr/local/poky is found and used, add ifdown script to avoid warning messages
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3649 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-31 17:42:44 +00:00
Richard Purdie
1a89cd510d scripts: Further quoting fixes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3443 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-09 20:13:45 +00:00
Richard Purdie
4a7acb65f6 scripts: Various tweaks/fixes for the qemu scripts
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3440 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-09 14:14:12 +00:00
Richard Purdie
4d5b401bc6 runqemu: Fix path after staging layout changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3204 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-11-22 16:57:02 +00:00
Richard Purdie
58184103e4 runqemu: Fix image names
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2193 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-07-17 13:25:31 +00:00
Richard Purdie
823dcb9c76 runqemu: Use pda image if sdk image not available for qemu machines
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2121 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-07-05 22:42:14 +00:00
Richard Purdie
a5e790a6fc runqemu: Use pda image if sdk image not available for qemu machines
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2120 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-07-05 22:40:07 +00:00
Richard Purdie
9f15140b5d Rename oh-image -> poky-image
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2020 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-06-27 12:18:02 +00:00
Richard Purdie
8142b95bf2 Update copyright
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1734 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-05-16 13:48:29 +00:00
Richard Purdie
3cce9ba903 scripts: Add support to scripts for spitz images
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1216 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-01-30 12:23:57 +00:00
Richard Purdie
86db48cd17 scripts: Add framework for supporting akita images under qemu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1214 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-01-29 17:03:29 +00:00
Ross Burton
b26da611c8 Remove bashism
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1157 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-01-17 15:55:35 +00:00