[meta-intel] [PATCH 0/3] meta-intel/common: Upgrade DPDK to v1.7.0
From: Sreeju Selvaraj Hi All, This series of patches consists below: 1. Upgraded the DPDK to the latest version v1.7.0 2. Added an include file based on the recipe for dpdk_1.6.0r2 3. Cherry picked patches to fix the test case failure of example app ring_pmd_autotest 4. Cherry picked patch to fix the installation failure of example app ip_pipeline 5. Added a patch to exclude the compilation of dpdk_qat, and vhost since they have the dependancy on qat source and fuse libraries. 6. Added MACHINE_EXTRA_RRECOMMENDS to enable DPDK by default for Romley. Please review the changes, and help to merge the patch into meta-intel:master and meta-intel:daisy branch Thanks and Regards, -Sreeju The following changes since commit 174f6c90d1fdc87b6d0ed846902b1b63d6c79dc5: meta-crystalforest: Update README with new build settings (2014-08-27 15:37:02 -0500) are available in the git repository at: git://git.yoctoproject.org/meta-intel-contrib sreeju/daisy/intel-bsp-common http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=sreeju/daisy/intel-bsp-common Sreeju Selvaraj (3): meta-intel/common: Add include file for DPDK meta-intel/common: Upgrade DPDK to v1.7.0 meta-romley: DPDK v1.7.0 support for Romley machine config common/recipes-extended/dpdk/dpdk.inc | 139 ...exclude-compilation-of-dpdk_qat-and-vhost.patch | 40 +++ ...examples-pipeline-build-with-all-examples.patch | 33 ++ ...e-extra-devices-creation-with-vdev-option.patch | 43 +++ .../dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch | 379 + common/recipes-extended/dpdk/dpdk_1.6.0r2.bb | 150 +--- common/recipes-extended/dpdk/dpdk_1.7.0.bb | 27 ++ meta-romley/conf/machine/romley-ivb.conf | 4 meta-romley/conf/machine/romley.conf | 5 9 files changed, 685 insertions(+), 135 deletions(-) create mode 100644 common/recipes-extended/dpdk/dpdk.inc create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-exclude-compilation-of-dpdk_qat-and-vhost.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch create mode 100644 common/recipes-extended/dpdk/dpdk_1.7.0.bb -- 1.9.1 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH 2/3] meta-intel/common: Upgrade DPDK to v1.7.0
From: Sreeju Selvaraj Added support for DPDK v1.7.0 Building of example apps dpdk_qat and vhost failed due to dependancy on qat source and fuse libraries, so created patch to exclude the compilation of these examples. Resolved the installation failure found in example app ip_pipeline by cherry picking the patch from dpdk.org Resolved the test failure found with example app ring_pmd_autotest by cherry picking the patches from dpdk.org Signed-off-by: Sreeju Selvaraj --- ...exclude-compilation-of-dpdk_qat-and-vhost.patch | 40 +++ ...examples-pipeline-build-with-all-examples.patch | 33 ++ ...e-extra-devices-creation-with-vdev-option.patch | 43 +++ .../dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch | 379 + common/recipes-extended/dpdk/dpdk_1.7.0.bb | 27 ++ 5 files changed, 522 insertions(+) create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-exclude-compilation-of-dpdk_qat-and-vhost.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-simplify-unit-tests.patch create mode 100644 common/recipes-extended/dpdk/dpdk_1.7.0.bb diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-exclude-compilation-of-dpdk_qat-and-vhost.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-exclude-compilation-of-dpdk_qat-and-vhost.patch new file mode 100644 index 000..9a9f0c0 --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-exclude-compilation-of-dpdk_qat-and-vhost.patch @@ -0,0 +1,40 @@ +From f43e001c7b47226f443abaf5e7690971fbf27d10 Mon Sep 17 00:00:00 2001 +From: Sreeju Selvaraj +Date: Fri, 5 Sep 2014 10:04:34 +0800 +Subject: [PATCH] examples: exclude compilation of dpdk_qat and vhost + +example apps dpdk_qat and vhost have dependency on qat source +and fuse libraries which causes compilation error. +There is a new global Makefile for examples added in dpdk v1.7.0 +So mute the compilation of these apps there. + +Signed-off-by: Sreeju Selvaraj +--- + examples/Makefile | 4 + 1 file changed, 4 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index dc85cf3..2127458 100644 +--- a/examples/Makefile b/examples/Makefile +@@ -38,9 +38,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc + include $(RTE_SDK)/mk/rte.vars.mk + + DIRS-y += cmdline +-ifneq ($(ICP_ROOT),) +-DIRS-y += dpdk_qat +-endif + DIRS-y += exception_path + DIRS-y += helloworld + DIRS-y += ip_pipeline +@@ -62,7 +59,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter + DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched + DIRS-y += quota_watermark + DIRS-y += timer +-DIRS-y += vhost + DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen + DIRS-y += vmdq + DIRS-y += vmdq_dcb +-- +1.9.1 + diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch new file mode 100644 index 000..234260b --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-examples-pipeline-build-with-all-examples.patch @@ -0,0 +1,33 @@ +From 835b75b7b22d8373f6ee17cb9ff456518ea7c208 Mon Sep 17 00:00:00 2001 +From: Thomas Monjalon +Date: Thu, 17 Jul 2014 10:30:52 +0200 +Subject: [PATCH] examples/pipeline: build with all examples + +Imported patch from: http://dpdk.org/browse/dpdk/log/ + +When adding this packet framework sample (commit 77a3346), +it has been forgotten to add it into the global makefile for +"make examples". + +Signed-off-by: Thomas Monjalon +(cherry picked from commit a6664a09a7caa5e63f9ae625cf1946b0eef7794e) +Signed-off-by: Sreeju Selvaraj +--- + examples/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/Makefile b/examples/Makefile +index d0624f6..dc85cf3 100644 +--- a/examples/Makefile b/examples/Makefile +@@ -43,6 +43,7 @@ DIRS-y += dpdk_qat + endif + DIRS-y += exception_path + DIRS-y += helloworld ++DIRS-y += ip_pipeline + DIRS-y += ip_reassembly + DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ip_fragmentation + DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_multicast +-- +1.9.1 + diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch new file mode 100644 index 000..02322b3 --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.7.0-ring-remove-extra-devices-creation-with-vdev-option.patch @@ -0,0 +1,43 @@ +From 0ffb8ec6af479f98daf1bf27e4a6648f41410e90 Mon Sep 17 00:00:00 2001 +From: Pablo de Lara +Date: Wed, 9 Jul 2014 15:35:35 +0100 +Subject: [PATCH] ring: remove extra devices creation with --vdev option + +Imported patch from: http://d
[meta-intel] [PATCH 3/3] meta-romley: DPDK v1.7.0 support for Romley machine config
From: Sreeju Selvaraj
Added MACHINE_EXTRA_RRECOMMENDS to include dpdk v1.7.0 support
for romley machiine, so that dpdk will be enabled by default
for Romley. Also included the dpdk example package, so that
user can use example apps to exercise the DPDK libraries.
Signed-off-by: Sreeju Selvaraj
---
meta-romley/conf/machine/romley-ivb.conf | 4
meta-romley/conf/machine/romley.conf | 5 +
2 files changed, 9 insertions(+)
diff --git a/meta-romley/conf/machine/romley-ivb.conf
b/meta-romley/conf/machine/romley-ivb.conf
index af52897..e130068 100644
--- a/meta-romley/conf/machine/romley-ivb.conf
+++ b/meta-romley/conf/machine/romley-ivb.conf
@@ -18,3 +18,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
${XSERVER_X86_MATROX_MGA} \
"
+PREFERRED_VERSION_dpdk ?= "1.7.0%"
+MACHINE_EXTRA_RRECOMMENDS += "dpdk \
+ dpdk-examples \
+ "
diff --git a/meta-romley/conf/machine/romley.conf
b/meta-romley/conf/machine/romley.conf
index ed52a1e..a814fc3 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -18,3 +18,8 @@ XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
${XSERVER_X86_MATROX_MGA} \
"
+PREFERRED_VERSION_dpdk ?= "1.7.0%"
+MACHINE_EXTRA_RRECOMMENDS += "dpdk \
+ dpdk-examples \
+ "
+
--
1.9.1
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH 1/3] meta-intel/common: Add include file for DPDK
From: Sreeju Selvaraj
Added include file dpdk.inc to share the common functionality
based on dpdk_1.6.0r2
Added a new variable EXAMPLE_BUILD_DIR. this points to apps build
directory which is different in dpdk v1.6.0r2 and v1.7.0.
User of dpdk.inc has to define EXAMPLE_BUILD_DIR for the
installation of example apps
Signed-off-by: Sreeju Selvaraj
---
common/recipes-extended/dpdk/dpdk.inc| 139 +
common/recipes-extended/dpdk/dpdk_1.6.0r2.bb | 150 +++
2 files changed, 154 insertions(+), 135 deletions(-)
create mode 100644 common/recipes-extended/dpdk/dpdk.inc
diff --git a/common/recipes-extended/dpdk/dpdk.inc
b/common/recipes-extended/dpdk/dpdk.inc
new file mode 100644
index 000..ef369df
--- /dev/null
+++ b/common/recipes-extended/dpdk/dpdk.inc
@@ -0,0 +1,139 @@
+DESCRIPTION = "Intel(r) Data Plane Development Kit"
+HOMEPAGE = "http://dpdk.org";
+LICENSE = "BSD & LGPLv2 & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
+
+
+RDEPENDS_${PN} += "python-subprocess"
+
+inherit module
+
+export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export RTE_SDK = "${S}"
+export RTE_TARGET="${TARGET_ARCH}-ivshmem-${TARGET_OS}app-gcc"
+export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
+export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib"
+export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}"
+export INSTALL_PATH = "${prefix}/dpdk"
+
+
+do_configure () {
+ #
+ ### default value for prefix is "usr", unsetting it, so it
+ ### will not be concatenated in ${RTE_TARGET}/Makefile
+ ### which will cause compilation failure
+ #
+ unset prefix
+
+ make O=$RTE_TARGET T=$RTE_TARGET config
+
+}
+
+
+do_compile () {
+ unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
+
+ cd ${S}/${RTE_TARGET}
+ oe_runmake EXTRA_LDFLAGS=" --sysroot=${STAGING_DIR_HOST}" \
+ EXTRA_CFLAGS=" --sysroot=${STAGING_DIR_HOST}" \
+ CROSS="${TARGET_PREFIX}" \
+ prefix="" LDFLAGS="" WERROR_FLAGS="-w" V=1
+
+}
+
+
+do_install () {
+
+ install -m 0755 -d ${D}/${INSTALL_PATH} \
+ ${D}/${INSTALL_PATH}/doc \
+ ${D}/${INSTALL_PATH}/tools \
+ ${D}/${INSTALL_PATH}/${RTE_TARGET} \
+ ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \
+ ${D}${includedir} \
+ ${D}${includedir}/arch \
+ ${D}${includedir}/exec-env \
+ ${D}${libdir} \
+ ${D}${MODULE_DIR}
+
+ install -m 0755 ${S}/${RTE_TARGET}/kmod/igb_uio.ko
${D}${MODULE_DIR}/
+ install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko
${D}${MODULE_DIR}/
+
+ install -m 640 ${S}/${RTE_TARGET}/lib/*.a ${D}${libdir}
+
+ install -m 640 ${S}/${RTE_TARGET}/.config
${D}/${INSTALL_PATH}/${RTE_TARGET}/
+ install -m 640 ${S}/${RTE_TARGET}/include/*.h
${D}${includedir}/
+ install -m 640 ${S}/${RTE_TARGET}/include/arch/*
${D}${includedir}/arch/
+ install -m 640 ${S}/${RTE_TARGET}/include/exec-env/*
${D}${includedir}/exec-env/
+ install -m 0755 ${S}/tools/*.py
${D}/${INSTALL_PATH}/tools/
+
+
+ #Install test applications
+ install -m 0755 ${S}/${RTE_TARGET}/app/test
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ install -m 0755 ${S}/${RTE_TARGET}/app/testpmd
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ install -m 0755 ${S}/${RTE_TARGET}/app/dump_cfg
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ install -m 0755 ${S}/${RTE_TARGET}/app/cmdline_test
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+
+
+ # Install example applications
+ # It is expected that user of this include file should define
EXAMPLES_BUILD_DIR
+ for app in ${S}/examples/*
+ do
+ case `basename ${app}` in
+ "dpdk_qat" | "vhost" | "vhost_xen" | "Makefile" ) continue
+ ;;
+ "l2fwd-ivshmem")
+ install -m 0755 ${app}/guest/${EXAMPLES_BUILD_DIR}/app/guest
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ install -m 0755 ${app}/host/${EXAMPLES_BUILD_DIR}/app/host
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ continue
+ ;;
+ "multi_process")
+ install -m 0755
${app}/client_server_mp/mp_client/${EXAMPLES_BUILD_DIR}/app/mp_client
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+ install -m 0755
${app}/client_server_mp/mp_server/${EXAMPLES_BUILD_DIR}/app/mp_server
${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+
Re: [meta-intel] [Patch v6 0/4] revised commits for the microcode feature enabling
Pulled into meta-intel/master. Thanks, Tom On Wed, 2014-09-03 at 23:24 -0700, nitin.a.kam...@intel.com wrote: > From: Nitin A Kamble > > This v6 pull request fixes an issue found on the v5, where the > core-image-minimal image was failing to build, due to missing dependencies. > The issues is now fixed by using the MACHINE_ESSENTIAL_EXTRA_RDEPENDS > variable which also applies to the core-minimal images, in place of the > MACHINE_EXTRA_RDEPENDS variable. > > Also 2 commits from the v5 set which both were modifying the meta-intel.inc > are combined into one. > > Thanks, > Nitin > > The following changes since commit b89a7c533df4fa17d8c239e674b0af83253a65b6: > > linux-yocto: Use _append when overrides are used (2014-09-02 16:05:02 -0500) > > are available in the git repository at: > > git://git.yoctoproject.org/meta-intel-contrib nitin/ucode > http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/ucode > > Nitin A Kamble (4): > meta-intel BSPs: include meta-intel.inc > iucode-tool: a new recipe for loading Intel CPU microcode > intel-microcode: a recipe for Intel microcode datafile > meta-intel BSPs: enable microcode loading support for images > > common/custom-licenses/Intel-Microcode-License | 123 > + > .../microcode/intel-microcode_20140624.bb | 52 + > common/recipes-core/microcode/iucode-tool_1.0.2.bb | 25 + > conf/machine/include/meta-intel.inc| 7 ++ > meta-crownbay/conf/machine/crownbay-noemgd.conf| 1 + > meta-emenlow/conf/machine/emenlow-noemgd.conf | 1 + > meta-fri2/conf/machine/fri2-noemgd.conf| 1 + > meta-jasperforest/conf/machine/jasperforest.conf | 1 + > meta-nuc/conf/machine/nuc.conf | 1 + > meta-sugarbay/conf/machine/sugarbay.conf | 1 + > 10 files changed, 213 insertions(+) > create mode 100644 common/custom-licenses/Intel-Microcode-License > create mode 100644 common/recipes-core/microcode/intel-microcode_20140624.bb > create mode 100644 common/recipes-core/microcode/iucode-tool_1.0.2.bb > -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH 0/5] Commits for retirement of EMGD based BSPs
From: Nitin A Kamble These commits remove the proprietary EMGD based BSPs and all the supporti needed for these from the meta-intel layer. Thanks, Nitin The following changes since commit 50abd223b626fc7508e24b55fc1b22c7b3a66e97: meta-intel BSPs: enable microcode loading support for images (2014-09-04 08:46:42 -0500) are available in the git repository at: git://git.yoctoproject.org/meta-intel-contrib nitin/misc http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc Nitin A Kamble (5): Remove emenlow machine support Remove crownbay machine support Remove fri2 machine support Remove all the changes related to the proprietary EMGD graphics driver Remove the xserver-xorg-1.9.3 recipe and it's files classes/emgd-gl.bbclass| 11 - .../Intel-software-license-emgd-1.14 | 42 -- .../Intel-software-license-emgd-1.16 | 42 -- .../Intel-software-license-emgd-1.18 | 42 -- ...-space-graphics-driver-binary-license-emgd-1.14 | 559 - ...-space-graphics-driver-binary-license-emgd-1.16 | 559 - ...-space-graphics-driver-binary-license-emgd-1.18 | 559 - .../xorg-driver/emgd-driver-bin/egl.pc | 12 - .../xorg-driver/emgd-driver-bin/glchar.patch | 17 - .../xorg-driver/emgd-driver-bin/gles_cm.pc | 12 - .../xorg-driver/emgd-driver-bin/glesv2.pc | 12 - .../xorg-driver/emgd-driver-bin_1.16.bb| 186 --- .../xorg-driver/emgd-driver-bin_1.18.bb| 188 --- .../xorg-xserver/xserver-xorg-1.9.3.inc| 20 - .../xserver-xorg-1.9.3/crosscompile.patch | 22 - .../fix_open_max_preprocessor_error.patch | 15 - .../xserver-xorg-1.9.3/macro_tweak.patch | 30 -- .../xorg-xserver/xserver-xorg-1.9.3/nodolt.patch | 14 - .../xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch | 92 .../xserver-xorg-1.9.3/werror-address-fix.patch| 49 -- .../xorg-xserver/xserver-xorg_1.9.3.bb | 4 - .../recipes-multimedia/gstreamer/gst-va-intel.bb | 9 - common/recipes-multimedia/libva/va-intel.bb| 3 - conf/machine/include/meta-intel-emgd.inc | 9 - conf/machine/include/meta-intel.inc| 4 - meta-crownbay/README | 51 +- meta-crownbay/conf/machine/crownbay.conf | 32 -- .../formfactor/formfactor/crownbay/machconfig | 3 - .../xserver-xf86-config/crownbay/xorg.conf | 43 -- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 3 - .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 - meta-emenlow/README| 49 +- meta-emenlow/conf/machine/emenlow.conf | 32 -- .../formfactor/formfactor/emenlow/machconfig | 3 - .../xserver-xf86-config/emenlow/xorg.conf | 43 -- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 - meta-fri2/README | 51 +- meta-fri2/conf/machine/fri2.conf | 47 -- .../alsa-state/alsa-state/fri2/asound.state| 411 --- .../formfactor/formfactor/fri2/machconfig | 3 - .../init-ifupdown/files/fri2/interfaces| 9 - .../xserver-xf86-config/fri2/xorg.conf | 60 --- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 - .../linux/linux-yocto-rt_3.10.bbappend | 7 - .../linux/linux-yocto-tiny_3.10.bbappend | 8 - .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 11 - 46 files changed, 18 insertions(+), 3386 deletions(-) delete mode 100644 classes/emgd-gl.bbclass delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14 delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.16 delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.18 delete mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14 delete mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.16 delete mode 100644 common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.18 delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/egl.pc delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/glchar.patch delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/gles_cm.pc delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/glesv2.pc delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb delete mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc delete mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch delete mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_ope
[meta-intel] [PATCH 2/5] Remove crownbay machine support
From: Nitin A Kamble The crownbay machine has been retired with this commit. This does not affect the crownbay-noemgd machine and it is supported as usual. Signed-off-by: Nitin A Kamble --- meta-crownbay/README | 51 +++--- meta-crownbay/conf/machine/crownbay.conf | 32 -- .../formfactor/formfactor/crownbay/machconfig | 3 -- .../xserver-xf86-config/crownbay/xorg.conf | 43 -- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 3 -- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 - 6 files changed, 6 insertions(+), 138 deletions(-) delete mode 100644 meta-crownbay/conf/machine/crownbay.conf delete mode 100644 meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend diff --git a/meta-crownbay/README b/meta-crownbay/README index 1946d3e..d0d9fe6 100644 --- a/meta-crownbay/README +++ b/meta-crownbay/README @@ -5,9 +5,6 @@ Please see the corresponding sections below for details. The Crown Bay platform consists of the Intel Atom E6xx processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). -It also supports the E6xx embedded on-chip graphics via the Intel -Embedded Media and Graphics Driver (EMGD) 1.18 Driver. - Further information on the platforms supported by this BSP can be found here: @@ -78,33 +75,12 @@ common metadata shared between BSPs) e.g.: yocto/meta-intel \ yocto/meta-intel/meta-crownbay \ -The meta-crownbay layer contains support for two different machine -configurations. These configurations are identical except for the fact -that the one prefixed with 'crownbay' makes use of the -Intel-proprietary EMGD 1.18 graphics driver, while the one prefixed -with 'crownbay-noemgd' does not. - -If you want to enable the layer that supports EMGD graphics add the -following to the local.conf file: - - MACHINE ?= "crownbay" - -The 'crownbay' machine includes the emgd-driver-bin package, which has -a proprietary license that must be whitelisted by adding the string -"license_emgd-driver-bin_1.18" to the LICENSE_FLAGS_WHITELIST variable -in your local.conf. For example: - - LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin" - -The emgd recipe depends on Xorg's dri and glx modules, which are built -only when 'opengl' is listed in DISTRO_FEATURES. So if the distro -doesn't list 'opengl' in the DISTRO_FEATURES you would need this -additional line to your local.conf: +The meta-crownbay layer contains support for the crownbay-noemgd machine +configuration. The previously supported crownbay machine with the +proprietary EMGD graphics driver has been retired. The 'crownbay-noemgd' +machine configuration uses the open source 'vesa' kernel driver. - DISTRO_FEATURES_append = " opengl" - -If you want to enable the layer that does not support EMGD graphics -add the following to the local.conf file: +To enable the layer add the following to the local.conf file: MACHINE ?= "crownbay-noemgd" @@ -117,21 +93,6 @@ At the end of a successful build, you should have a live image that you can boot from a USB flash drive (see instructions on how to do that below, in the section 'Booting the images from /binary'). -NOTE: The 'crownbay' machine will include support for hardware video -acceleration via gstreamer if and only if the "commercial" string is -added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. - -For example: - - LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial" - -The reason this is needed is to prevent the image from including -anything that might violate the license terms of the packages used to -implement the the video acceleration feature, such as gst-ffmpeg and -ffmpeg. As always, please consult the licenses included in the -specific packages for details if you use packages that require -particular LICENSE_FLAGS. - As an alternative to downloading the BSP tarball, you can also work directly from the meta-intel git repository. For each BSP in the 'meta-intel' repository, there are multiple branches, one @@ -153,7 +114,7 @@ Under Linux, insert a USB flash drive. Assuming the USB flash drive takes device /dev/sdf, use dd to copy the live image to it. For example: -# dd if=core-image-sato-crownbay.hddimg of=/dev/sdf +# dd if=core-image-sato-crownbay-noemgd.hddimg of=/dev/sdf # sync # eject /dev/sdf diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf deleted file mode 100644 index 9298ef2..000 --- a/meta-crownbay/conf/machine/crownbay.conf +++ /dev/null @@ -1,32 +0,0 @@ -#@TYPE: Machine -#@NAME: crownbay - -#@WEBTITLE: Intel Atom E6xx Processor With Intel EG20T Controller Hub Development Kit (Crown Bay) With Proprietary IEMGD Accelerated G
[meta-intel] [PATCH 3/5] Remove fri2 machine support
From: Nitin A Kamble The fri2 machine has been retired with this commit. This does not affect the fri2-noemgd machine and it is supported as usual. Signed-off-by: Nitin A Kamble --- meta-fri2/README | 51 +-- meta-fri2/conf/machine/fri2.conf | 47 --- .../alsa-state/alsa-state/fri2/asound.state| 411 - .../formfactor/formfactor/fri2/machconfig | 3 - .../init-ifupdown/files/fri2/interfaces| 9 - .../xserver-xf86-config/fri2/xorg.conf | 60 --- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 - .../linux/linux-yocto-rt_3.10.bbappend | 7 - .../linux/linux-yocto-tiny_3.10.bbappend | 8 - .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 11 - 10 files changed, 6 insertions(+), 602 deletions(-) delete mode 100644 meta-fri2/conf/machine/fri2.conf delete mode 100644 meta-fri2/recipes-bsp/alsa-state/alsa-state/fri2/asound.state delete mode 100644 meta-fri2/recipes-bsp/formfactor/formfactor/fri2/machconfig delete mode 100644 meta-fri2/recipes-core/init-ifupdown/files/fri2/interfaces delete mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf delete mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend diff --git a/meta-fri2/README b/meta-fri2/README index d5ac667..6e90c33 100644 --- a/meta-fri2/README +++ b/meta-fri2/README @@ -12,9 +12,6 @@ Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). The Fish River Island II includes a variety of communications options and other machine-to-machine (m2m) capabilities. -It also supports the E6xx embedded on-chip graphics via the Intel -Embedded Media and Graphics Driver (EMGD). - Information on all Intel embedded platforms can be found here: http://www.intel.com/p/en_US/embedded/hwsw/hardware @@ -96,33 +93,12 @@ bblayers.conf, e.g.: yocto/meta-intel \ yocto/meta-intel/meta-fri2 \ -The meta-fri2 layer contains support for two different machine -configurations. These configurations are identical except for the fact -that the one prefixed with 'fri2' makes use of the Intel-proprietary -EMGD graphics driver, while the one prefixed with 'fri2-noemgd' -does not. - -If you want to enable the layer that supports EMGD graphics add the -following to the local.conf file: - - MACHINE ?= "fri2" - -The 'fri2' machine includes the emgd-driver-bin package, which has a -proprietary license that must be whitelisted by adding the string -"license_emgd-driver-bin" to the LICENSE_FLAGS_WHITELIST variable in -your local.conf. For example: - - LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin" - -The emgd recipe depends on Xorg's dri and glx modules, which are built -only when 'opengl' is listed in DISTRO_FEATURES. So if the distro -doesn't list 'opengl' in the DISTRO_FEATURES you would need this -additional line to your local.conf: +The meta-fri2 layer contains support for fri2-noemgd machine configuration. +The previously supported fri2 machine with the proprietary EMGD graphics +driver has been retired. The 'fri2-noemgd' machine configuration uses +the open source 'vesa' kernel driver. - DISTRO_FEATURES_append = " opengl" - -If you want to enable the layer that does not support EMGD graphics, -add the following to the local.conf file: +To enable the layer add the following to the local.conf file: MACHINE ?= "fri2-noemgd" @@ -135,21 +111,6 @@ At the end of a successful build, you should have a live image that you can boot from a USB flash drive (see instructions on how to do that below, in the section 'Booting the images from /binary'). -NOTE: The 'fri2' machine will include support for hardware video -acceleration via gstreamer if and only if the "commercial" string is -added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf. - -For example: - - LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial" - -The reason this is needed is to prevent the image from including -anything that might violate the license terms of the packages used to -implement the the video acceleration feature, such as gst-ffmpeg and -ffmpeg. As always, please consult the licenses included in the -specific packages for details if you use packages that require -particular LICENSE_FLAGS. - As an alternative to downloading the BSP tarball, you can also work directly from the meta-intel git repository. For each BSP in the 'meta-intel' repository, there are multiple branches, one @@ -171,7 +132,7 @@ Under Linux, insert a USB flash drive. Assuming the USB flash drive takes device /dev/sdf, use dd to copy the live image to it. For example: -# dd if=core-image-sato-fri2.hddimg of=/dev/sdf +# dd if=core-image-sato-fri2-noemgd.hddimg of=/dev/sdf # sync # eject /dev/sdf diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf deleted file mode 100644 index 83072d3..000 --- a/meta-fri2/
[meta-intel] [PATCH 1/5] Remove emenlow machine support
From: Nitin A Kamble
The emenlow machine has been retired with this commit. This does not affect
the emenlow-noemgd machine and it is supported as usual.
Signed-off-by: Nitin A Kamble
---
meta-emenlow/README| 49 +++---
meta-emenlow/conf/machine/emenlow.conf | 32 --
.../formfactor/formfactor/emenlow/machconfig | 3 --
.../xserver-xf86-config/emenlow/xorg.conf | 43 ---
.../recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 --
5 files changed, 6 insertions(+), 134 deletions(-)
delete mode 100644 meta-emenlow/conf/machine/emenlow.conf
delete mode 100644
meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig
delete mode 100644
meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
diff --git a/meta-emenlow/README b/meta-emenlow/README
index 05a0483..0bf0cbc 100644
--- a/meta-emenlow/README
+++ b/meta-emenlow/README
@@ -82,35 +82,13 @@ common metadata shared between BSPs) e.g.:
yocto/meta-intel \
yocto/meta-intel/meta-emenlow \
-The meta-emenlow layer contains support for two different machine
-configurations. These configurations are identical except for the fact
-that the one prefixed with 'emenlow' makes use of the
-Intel-proprietary EMGD 1.18 graphics driver, while the one prefixed
-with 'emenlow-noemgd' does not. The 'emenlow-noemgd' machine
-configuration instead uses the open source 'gma500' kernel DRM driver
+The meta-emenlow layer contains support for emenlow-noemgd machine
+configuration. The previously supported emenlow machine with the
+proprietary EMGD graphics driver has been retired. The 'emenlow-noemgd'
+machine configuration uses the open source 'gma500' kernel DRM driver
along with the 'modesetting' X driver.
-If you want to enable the layer that supports EMGD graphics add the
-following to the local.conf file:
-
- MACHINE ?= "emenlow"
-
-The 'emenlow' machine includes the emgd-driver-bin package, which has
-a proprietary license that must be whitelisted by adding the string
-"license_emgd-driver-bin_1.18" to the LICENSE_FLAGS_WHITELIST variable
-in your local.conf. For example:
-
- LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
-
-The emgd recipe depends on Xorg's dri and glx modules, which are built
-only when 'opengl' is listed in DISTRO_FEATURES. So if the distro
-doesn't list 'opengl' in the DISTRO_FEATURES you would need this
-additional line to your local.conf:
-
- DISTRO_FEATURES_append = " opengl"
-
-If you want to enable the layer that does not support EMGD graphics
-add the following to the local.conf file:
+To enable the layer add the following to the local.conf file:
MACHINE ?= "emenlow-noemgd"
@@ -123,21 +101,6 @@ At the end of a successful build, you should have a live
image that
you can boot from a USB flash drive (see instructions on how to do
that below, in the section 'Booting the images from /binary').
-NOTE: The 'emenlow' machine will include support for hardware video
-acceleration via gstreamer if and only if the "commercial" string is
-added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
-
-For example:
-
- LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin commercial"
-
-The reason this is needed is to prevent the image from including
-anything that might violate the license terms of the packages used to
-implement the the video acceleration feature, such as gst-ffmpeg and
-ffmpeg. As always, please consult the licenses included in the
-specific packages for details if you use packages that require
-particular LICENSE_FLAGS.
-
As an alternative to downloading the BSP tarball, you can also work
directly from the meta-intel git repository. For each BSP in the
'meta-intel' repository, there are multiple branches, one
@@ -159,7 +122,7 @@ Under Linux, insert a USB flash drive. Assuming the USB
flash drive
takes device /dev/sdf, use dd to copy the live image to it. For
example:
-# dd if=core-image-sato-emenlow.hddimg of=/dev/sdf
+# dd if=core-image-sato-emenlow-noemgd.hddimg of=/dev/sdf
# sync
# eject /dev/sdf
diff --git a/meta-emenlow/conf/machine/emenlow.conf
b/meta-emenlow/conf/machine/emenlow.conf
deleted file mode 100644
index 502d196..000
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#@TYPE: Machine
-#@NAME: emenlow
-
-#@WEBTITLE: Intel Atom Z5xx Processor With Intel US15W Controller Hub (eMenlow)
-
-#@DESCRIPTION: Machine configuration for eMenlow based systems, like the
-# Webs-2120 box.
-
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/meta-intel-emgd.inc
-
-MACHINE_FEATURES += "va-impl-mixvideo"
-
-MACHINE_HWCODECS ?= "va-intel"
-XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
- emgd-gst-plugins-mixvideo gst-va-intel"
-
-XSERVER ?= "${XSERVER_X86_BASE} \
-
[meta-intel] [PATCH 4/5] Remove all the changes related to the proprietary EMGD graphics driver
From: Nitin A Kamble
As all the EMGD based BSPs have been retired, there is no need for the
proprietary EMGD support in the meta-intel layer.
Signed-off-by: Nitin A Kamble
---
classes/emgd-gl.bbclass| 11 -
.../Intel-software-license-emgd-1.14 | 42 --
.../Intel-software-license-emgd-1.16 | 42 --
.../Intel-software-license-emgd-1.18 | 42 --
...-space-graphics-driver-binary-license-emgd-1.14 | 559 -
...-space-graphics-driver-binary-license-emgd-1.16 | 559 -
...-space-graphics-driver-binary-license-emgd-1.18 | 559 -
.../xorg-driver/emgd-driver-bin/egl.pc | 12 -
.../xorg-driver/emgd-driver-bin/glchar.patch | 17 -
.../xorg-driver/emgd-driver-bin/gles_cm.pc | 12 -
.../xorg-driver/emgd-driver-bin/glesv2.pc | 12 -
.../xorg-driver/emgd-driver-bin_1.16.bb| 186 ---
.../xorg-driver/emgd-driver-bin_1.18.bb| 188 ---
.../recipes-multimedia/gstreamer/gst-va-intel.bb | 9 -
common/recipes-multimedia/libva/va-intel.bb| 3 -
conf/machine/include/meta-intel-emgd.inc | 9 -
conf/machine/include/meta-intel.inc| 4 -
17 files changed, 2266 deletions(-)
delete mode 100644 classes/emgd-gl.bbclass
delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.14
delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.16
delete mode 100644 common/custom-licenses/Intel-software-license-emgd-1.18
delete mode 100644
common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.14
delete mode 100644
common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.16
delete mode 100644
common/custom-licenses/Intel-user-space-graphics-driver-binary-license-emgd-1.18
delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/egl.pc
delete mode 100644
common/recipes-graphics/xorg-driver/emgd-driver-bin/glchar.patch
delete mode 100644
common/recipes-graphics/xorg-driver/emgd-driver-bin/gles_cm.pc
delete mode 100644
common/recipes-graphics/xorg-driver/emgd-driver-bin/glesv2.pc
delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb
delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb
delete mode 100644 conf/machine/include/meta-intel-emgd.inc
diff --git a/classes/emgd-gl.bbclass b/classes/emgd-gl.bbclass
deleted file mode 100644
index ef1df69..000
--- a/classes/emgd-gl.bbclass
+++ /dev/null
@@ -1,11 +0,0 @@
-# give a different PACKAGE_ARCH to the recipes involved with opengl
-python __anonymous () {
-provides = set((d.getVar("PROVIDES", True) or "").split())
-depends = set((d.getVar("DEPENDS", True) or "").split())
-
-glp = set([ "virtual/libgles1", "virtual/libgles2", "virtual/egl",
"virtual/mesa" , "virtual/libgl"])
-if list(glp & (provides | depends)): # set union & intersection operations
-# matched
-d.appendVar("PACKAGE_ARCH", "${GLSUFFIX}")
-return
-}
diff --git a/common/custom-licenses/Intel-software-license-emgd-1.14
b/common/custom-licenses/Intel-software-license-emgd-1.14
deleted file mode 100644
index 5a39c93..000
--- a/common/custom-licenses/Intel-software-license-emgd-1.14
+++ /dev/null
@@ -1,42 +0,0 @@
-INTEL SOFTWARE LICENSE AGREEMENT
-
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-
-Do not use or load this software and any associated materials (collectively,
the "Software") until you have carefully read the following terms and
conditions. By loading or using the Software, you agree to the terms of this
Agreement. If you do not wish to so agree, do not install or use the Software.
-
-* The Linux DRM kernel source code, when included with this Software, is not
subject to the terms of this Agreement but is subject to the �GNU General
Public License Version 2�, which may be obtained at the following web site:
http://www.gnu.org/licenses/gpl.txt
-
-* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. (copyright may
need to be changed)
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining copy
of this software and
-* associated documentation files (the "Software"), to deal in the Software
without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice (including the next
paragraph) shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
[meta-intel] [PATCH 5/5] Remove the xserver-xorg-1.9.3 recipe and it's files
From: Nitin A Kamble
The xserver-xorg-1.9.3 recipe was needed only for the EMGD graphics driver.
After removing the EMGD support from the meta-intel layer there is no need
to keep this old recipe and it's files.
Signed-off-by: Nitin A Kamble
---
.../xorg-xserver/xserver-xorg-1.9.3.inc| 20 -
.../xserver-xorg-1.9.3/crosscompile.patch | 22 --
.../fix_open_max_preprocessor_error.patch | 15
.../xserver-xorg-1.9.3/macro_tweak.patch | 30 ---
.../xorg-xserver/xserver-xorg-1.9.3/nodolt.patch | 14
.../xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch | 92 --
.../xserver-xorg-1.9.3/werror-address-fix.patch| 49
.../xorg-xserver/xserver-xorg_1.9.3.bb | 4 -
8 files changed, 246 deletions(-)
delete mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/ptr-to-int-cast-fix.patch
delete mode 100644
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/werror-address-fix.patch
delete mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
deleted file mode 100644
index 1c71d7b..000
--- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SRC_URI += "file://nodolt.patch \
-file://crosscompile.patch"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
-
-# What once were warnings now are errors, fix those up
-SRC_URI += "file://werror-address-fix.patch \
-file://ptr-to-int-cast-fix.patch"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-DEPENDS += "font-util"
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
-
-SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
-SRC_URI[sha256sum] =
"864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
-
-PR = "r2"
diff --git
a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
deleted file mode 100644
index 2f98bb8..000
--- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/configure.ac b/configure.ac
-index b3b752c..600500b 100644
a/configure.ac
-+++ b/configure.ac
-@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for
/etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
- dnl compiling, assume default font path uses standard FONTROOTDIR directories.
-
DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--if test "$cross_compiling" != yes; then
-- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-- [case $host_os in
-+ case $host_os in
- darwin*)
DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-- esac])
--fi
-+ esac
- AC_ARG_WITH(default-font-path,
AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font
dirs]),
- [ FONTPATH="$withval" ],
- [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git
a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 9c33072..000
---
a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: git/os/osdep.h
-===
git.orig/os/osdep.h2008-10-07 18:38:21.0 +0100
-+++ git/os/osdep.h 2008-10-07 18:39:36.0 +0100
-@@ -92,7 +92,7 @@
- * like sysconf(_SC_OPEN_MAX) is not supported.
- */
-
--#if OPEN_MAX <= 256
-+#if 0
- #define MAXSOCKS (OPEN_MAX - 1)
- #else
- #define MAXSOCKS 256
diff --git
a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch
b/common/recipes-grap
