diff options
| author |   Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-10-04 16:53:36 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-05 10:10:11 +0100 |
| commit | eb629657aaf0cb1c52aaae7612ee5b62b29f6b7c (patch) | |
| tree | 086fee62a4a39042552bf74afdbeacaea00a9e25 /scripts | |
| parent | fe18ded6c3ab039ffae02d16e24bc06295ad38a0 (diff) | |
| download | openembedded-core-contrib-eb629657aaf0cb1c52aaae7612ee5b62b29f6b7c.tar.gz | |
machine.conf: Remove duplicate xserver choices
All kernel choices today (linux-yocto_4.* and custom) have the same xserver options,
so remove the duplicate lines.
(From meta-yocto rev: c456b5cf172e5ee1fca078383cad189325ea05f5)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf index d5abe4f613..a95562797a 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf @@ -33,15 +33,7 @@ MACHINE_FEATURES += "wifi efi pcbios" {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} -{{ if xserver == "y" and (kernel_choice == "linux-yocto_4.4" or kernel_choice == "linux-yocto_4.1"): }} -{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} -{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} -{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} -{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} -{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} - -{{ if xserver == "y" and kernel_choice == "custom": }} +{{ if xserver == "y": }} {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |