diff options
author | Alistair Francis <alistair.francis@xilinx.com> | 2017-11-21 16:43:56 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:34 +0000 |
commit | 7159b281e7c2ec235034205d4dae664c87a9afca (patch) | |
tree | da41d59b9cbf2d4f5e761147253eeb5f5603a8f1 /scripts/runqemu | |
parent | f866673f874809a222d5efcc0905c08d975024ec (diff) | |
download | poky-7159b281e7c2ec235034205d4dae664c87a9afca.tar.gz |
runqemu: Allow the user to override the Kernel option
Update the runqemu script to allow the user to specify a Kernel to boot
when calling runqemu.
(From OE-Core rev: eaf2793a98cb27d82561da0f8993f2b4b304ecc2)
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Ben Levinsky <ben.levinsky@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 9cdabe865b..01d831520a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -584,11 +584,15 @@ class BaseConfig(object): | |||
584 | if self.fstype in self.vmtypes: | 584 | if self.fstype in self.vmtypes: |
585 | return | 585 | return |
586 | 586 | ||
587 | # See if the user supplied a KERNEL option | ||
588 | if self.get('KERNEL'): | ||
589 | self.kernel = self.get('KERNEL') | ||
590 | |||
587 | # QB_DEFAULT_KERNEL is always a full file path | 591 | # QB_DEFAULT_KERNEL is always a full file path |
588 | kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL')) | 592 | kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL')) |
589 | 593 | ||
590 | # The user didn't want a kernel to be loaded | 594 | # The user didn't want a kernel to be loaded |
591 | if kernel_name == "none": | 595 | if kernel_name == "none" and not self.kernel: |
592 | return | 596 | return |
593 | 597 | ||
594 | deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') | 598 | deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') |