From 30f5ce1d2168389295b4813e01898c2fb0f9bab9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 18 Feb 2022 19:43:56 -0300 Subject: Generalize overrides subsystem for NXP and Mainline support Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and mainline-bsp. So, for example, the mx8mq override is split into: - imx-generic-bsp: compatible with every i.MX SoC and both BSP variants - imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP - imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP - mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants - mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP - mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP - mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants - mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP - mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP - mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants - mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP - mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP The extender mechanism is responsible for extending the override list to include the generic overrides. We can then use the three different variants to handle the metadata correctly. Generically speaking, the conversion mainly was automated (with a lot of back and forth until getting it right). To convert an existing layer, the following script can be used: ```sh git ls-files classes recipes-* \ | xargs sed -i \ -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \ -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \ -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \ -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \ \ -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \ -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \ -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(vf\w*\),:\1-generic-bsp,g' \ -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \ -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \ -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \ -e 's,(\(imx\)),(\1-nxp-bsp),g' \ -e 's,\(imx\)|,\1-nxp-bsp|,g' \ -e 's,|\(imx\)),|\1-nxp-bsp),g' for d in $(find -type d | egrep '/mx[6-8]w*'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/imx$'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/mx[5s]w*'); do git mv $d $d-generic-bsp done ``` Fixes: #791. Signed-off-by: Otavio Salvador --- .../0016-xserver-common-enable-iglx-module.patch | 30 ++++++++++++++++++++++ .../0016-xserver-common-enable-iglx-module.patch | 30 ---------------------- 2 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch (limited to 'dynamic-layers/openembedded-layer') diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch new file mode 100644 index 00000000..283a081b --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch @@ -0,0 +1,30 @@ +From 8ad045e5e664fe2d1bd9f88616d5bf83437aab4e Mon Sep 17 00:00:00 2001 +From: Yang Dong +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 +--- + 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/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 deleted file mode 100644 index 283a081b..00000000 --- a/dynamic-layers/openembedded-layer/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 -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf