[meta-freescale] [PATCH] xserver-common: Move to dynamic layers

Gary Thomas gary at mlbassoc.com
Wed Jan 25 03:47:10 PST 2017


The xserver-common recipe can only be built if the openbedded (meta-oe)
layer is present, so move it to the dynamic layers to prevent breakage
if that layer is not in the build.

Signed-off-by: Gary Thomas <gary at mlbassoc.com>
---
 .../0016-xserver-common-enable-iglx-module.patch   | 30 ++++++++++++++++++++++
 .../xserver-common/xserver-common_%.bbappend       | 10 ++++++++
 .../0016-xserver-common-enable-iglx-module.patch   | 30 ----------------------
 .../xserver-common/xserver-common_%.bbappend       | 10 --------
 4 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
 create mode 100644 dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
 delete mode 100644 recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
 delete mode 100644 recipes-graphics/xserver-common/xserver-common_%.bbappend

diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
new file mode 100644
index 0000000..283a081
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
@@ -0,0 +1,30 @@
+From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001
+From: Yang Dong <b56112 at freescale.com>
+Date: Wed, 9 Sep 2015 13:08:57 +0800
+Subject: [PATCH] xserver-common: enable iglx module
+
+Enable iglx module to pass indirect glx rendering test case.
+
+Upstream-Status: Inappropriate [imx specific]
+
+Date: Sep 9, 2015
+Signed-off-by Yang Dong <b56112 at freescale.com>
+---
+ X11/xserver-common | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/X11/xserver-common b/X11/xserver-common
+index 4dc48c4..d19b858 100644
+--- a/X11/xserver-common
++++ b/X11/xserver-common
+@@ -44,6 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
+ export USER=root
+ export XSERVER_DEFAULT_ORIENTATION=normal
+ 
++INPUT_EXTRA_ARGS="+iglx"
+ ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
+ DPI="100"
+ MOUSE=""
+-- 
+1.9.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
new file mode 100644
index 0000000..28d1f7b
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend
@@ -0,0 +1,10 @@
+# i.MX extra configuration 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PATCHES_IMX_SPECIFIC = " file://0016-xserver-common-enable-iglx-module.patch \
+"
+SRC_URI_append = " \
+    ${PATCHES_IMX_SPECIFIC} \
+"
+PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}"
diff --git a/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch b/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
deleted file mode 100644
index 283a081..0000000
--- a/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001
-From: Yang Dong <b56112 at freescale.com>
-Date: Wed, 9 Sep 2015 13:08:57 +0800
-Subject: [PATCH] xserver-common: enable iglx module
-
-Enable iglx module to pass indirect glx rendering test case.
-
-Upstream-Status: Inappropriate [imx specific]
-
-Date: Sep 9, 2015
-Signed-off-by Yang Dong <b56112 at freescale.com>
----
- X11/xserver-common | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 4dc48c4..d19b858 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -44,6 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
- export USER=root
- export XSERVER_DEFAULT_ORIENTATION=normal
- 
-+INPUT_EXTRA_ARGS="+iglx"
- ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
- DPI="100"
- MOUSE=""
--- 
-1.9.1
-
diff --git a/recipes-graphics/xserver-common/xserver-common_%.bbappend b/recipes-graphics/xserver-common/xserver-common_%.bbappend
deleted file mode 100644
index 28d1f7b..0000000
--- a/recipes-graphics/xserver-common/xserver-common_%.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-# i.MX extra configuration 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PATCHES_IMX_SPECIFIC = " file://0016-xserver-common-enable-iglx-module.patch \
-"
-SRC_URI_append = " \
-    ${PATCHES_IMX_SPECIFIC} \
-"
-PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
-PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}"
-- 
2.7.4



More information about the meta-freescale mailing list