Fixes [YOCTO #5108] (adds support for xf86-video-mga to generic-x86*) The genericx86 and genericx86-64 machines share a great deal in common in terms of machine features, required packages, etc. Use a common include file to simplify changes to both machine definitions and avoid accidental omissions.
Replace the hard-coded XSERVER assignment with the XSERVER_IA32* defines from ia32-base.inc. Signed-off-by: Darren Hart <[email protected]> Cc: Ross Burton <[email protected]> Cc: [email protected] --- meta-yocto-bsp/conf/machine/genericx86-64.conf | 29 +----------------- meta-yocto-bsp/conf/machine/genericx86.conf | 31 +------------------- meta-yocto-bsp/conf/machine/include/x86-common.inc | 26 ++++++++++++++++ 3 files changed, 28 insertions(+), 58 deletions(-) create mode 100644 meta-yocto-bsp/conf/machine/include/x86-common.inc diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 7825bae..d4b0466 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -4,31 +4,4 @@ #@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. include conf/machine/include/tune-x86_64.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa efi pcbios" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.10%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-glx \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-fbdev \ - xf86-video-modesetting \ - xf86-video-vesa \ - xf86-video-intel \ - mesa-driver-i915 \ - mesa-driver-i965" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +include conf/machine/include/x86-common.inc diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index ff5cbc9..1e1107d 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -4,33 +4,4 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. include conf/machine/include/tune-atom.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.10%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-glx \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-fbdev \ - xf86-video-modesetting \ - xf86-video-vesa \ - xf86-video-intel \ - mesa-driver-i915 \ - mesa-driver-i965" - -#MACHINE_EXTRA_RDEPENDS = "rt2860" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +include conf/machine/include/x86-common.inc diff --git a/meta-yocto-bsp/conf/machine/include/x86-common.inc b/meta-yocto-bsp/conf/machine/include/x86-common.inc new file mode 100644 index 0000000..0454fdd --- /dev/null +++ b/meta-yocto-bsp/conf/machine/include/x86-common.inc @@ -0,0 +1,26 @@ +include conf/machine/include/ia32-base.inc +MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa \ + efi pcbios" + +KERNEL_IMAGETYPE = "bzImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.10%" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + ${XSERVER_IA32_I965} \ + ${XSERVER_IA32_MATROX_MGA} \ + ${XSERVER_IA32_FBDEV} \ + ${XSERVER_IA32_VESA} \ + ${XSERVER_IA32_MODESETTING} \ + " + +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d" + +IMAGE_FSTYPES ?= "ext3 cpio.gz live" + +GLIBC_ADDONS = "nptl" + +EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
