summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 15:22:24 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:39 -0700
commitc3b41c1f3cdb3f2c4b39e295c36c01a1b43abb74 (patch)
treea4426fcf8b0268f41ce7cdca1337aa6dcaa5bb40 /meta-oe
parent24af0456caceb4bc7f78812a0c7d3a02df8e2e4a (diff)
downloadmeta-openembedded-c3b41c1f3cdb3f2c4b39e295c36c01a1b43abb74.tar.gz
xserver-common: refresh patches
WARNING: xserver-common-1.34-r9 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0001-Don-t-install-Xsession-or-Xserver.patch patching file Makefile Hunk #1 succeeded at 20 with fuzz 1. and others Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch12
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch14
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch12
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch14
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch20
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch16
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch15
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch14
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch15
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch15
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch13
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch4
12 files changed, 70 insertions, 94 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
index 29dd71ab0..2bfe85b28 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
@@ -1,7 +1,7 @@
1From 834fa06920f88ceedf752964c8e296c653d541e4 Mon Sep 17 00:00:00 2001 1From f919725918fad2b32504f89a28310fcae4ab0406 Mon Sep 17 00:00:00 2001
2From: Yu Ke <ke.yu@intel.com> 2From: Yu Ke <ke.yu@intel.com>
3Date: Wed, 11 Apr 2012 14:26:16 +0200 3Date: Wed, 11 Apr 2012 14:26:16 +0200
4Subject: [PATCH 01/12] COPYING: add GPLv2 license file 4Subject: [PATCH] COPYING: add GPLv2 license file
5 5
6this is a local file recipe and the license file is missing.In order 6this is a local file recipe and the license file is missing.In order
7to pass the license checksum checking, the license file is needed. So 7to pass the license checksum checking, the license file is needed. So
@@ -9,9 +9,10 @@ this patch add the GPLv2 license file.
9 9
10Signed-off-by: Yu Ke <ke.yu@intel.com> 10Signed-off-by: Yu Ke <ke.yu@intel.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12
12--- 13---
13 COPYING | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 14 COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
14 1 files changed, 339 insertions(+), 0 deletions(-) 15 1 file changed, 339 insertions(+)
15 create mode 100644 COPYING 16 create mode 100644 COPYING
16 17
17diff --git a/COPYING b/COPYING 18diff --git a/COPYING b/COPYING
@@ -359,6 +360,3 @@ index 0000000..d511905
359+consider it more useful to permit linking proprietary applications with the 360+consider it more useful to permit linking proprietary applications with the
360+library. If this is what you want to do, use the GNU Lesser General 361+library. If this is what you want to do, use the GNU Lesser General
361+Public License instead of this License. 362+Public License instead of this License.
362--
3631.7.8.5
364
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
index 26288d6d1..0ed12d106 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
@@ -1,4 +1,4 @@
1From c92ce6a4b3622874f820b5ec487a2b63f519826c Mon Sep 17 00:00:00 2001 1From 1002a1137b140dad3319bf3206fec5b6c6b74fea Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 10 Nov 2016 14:33:05 +0200 3Date: Thu, 10 Nov 2016 14:33:05 +0200
4Subject: [PATCH] Don't install Xsession or Xserver 4Subject: [PATCH] Don't install Xsession or Xserver
@@ -8,15 +8,16 @@ Xsession scripts and xserver-common from this recipe will still
8be used as before. 8be used as before.
9 9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
11--- 12---
12 Makefile | 1 - 13 Makefile | 2 --
13 1 file changed, 1 deletion(-) 14 1 file changed, 2 deletions(-)
14 15
15diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
16index caa5de1..7e36bbc 100644 17index caa5de1..9428205 100644
17--- a/Makefile 18--- a/Makefile
18+++ b/Makefile 19+++ b/Makefile
19@@ -20,7 +20,5 @@ install-program: 20@@ -20,8 +20,6 @@ install-program:
20 install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh 21 install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh
21 install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults 22 install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults
22 install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit 23 install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit
@@ -25,6 +26,3 @@ index caa5de1..7e36bbc 100644
25 install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common 26 install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common
26 install -m 755 X11/functions $(DESTDIR)/etc/X11/functions 27 install -m 755 X11/functions $(DESTDIR)/etc/X11/functions
27 install -d $(DESTDIR)/etc/X11/xmodmap 28 install -d $(DESTDIR)/etc/X11/xmodmap
28--
292.1.4
30
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
index 23b5345a1..0be3fa5b3 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
@@ -1,12 +1,13 @@
1From 3d1a1a8273112668927a6c6bb3e361e896f5b229 Mon Sep 17 00:00:00 2001 1From 3b5f431a370054bfc090796e8d55de8c8cea46f4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:28:45 +0200 3Date: Wed, 11 Apr 2012 14:28:45 +0200
4Subject: [PATCH 02/12] add setdpi Xinit.d script 4Subject: [PATCH] add setdpi Xinit.d script
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
7--- 8---
8 X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 9 X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
9 1 files changed, 92 insertions(+), 0 deletions(-) 10 1 file changed, 92 insertions(+)
10 create mode 100644 X11/Xinit.d/50setdpi 11 create mode 100644 X11/Xinit.d/50setdpi
11 12
12diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi 13diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi
@@ -107,6 +108,3 @@ index 0000000..04a2edd
107+ 108+
108+set_dpi "$SET_SCREEN_DPI" 109+set_dpi "$SET_SCREEN_DPI"
109+set_rxvt_font "$SCREEN_DPI" 110+set_rxvt_font "$SCREEN_DPI"
110--
1111.7.8.5
112
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
index 7ee8572b8..53a283fea 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
@@ -1,15 +1,16 @@
1From 0c42e1fb84cc2bfe768bed17f3b979aca868cf64 Mon Sep 17 00:00:00 2001 1From b60e364c35d56a2a3164254d98c9931bfa3feed4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:34:43 +0200 3Date: Wed, 11 Apr 2012 14:34:43 +0200
4Subject: [PATCH 06/12] add support for /etc/X11/xserver-system 4Subject: [PATCH] add support for /etc/X11/xserver-system
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
7--- 8---
8 X11/xserver-common | 5 +++++ 9 X11/xserver-common | 5 +++++
9 1 files changed, 5 insertions(+), 0 deletions(-) 10 1 file changed, 5 insertions(+)
10 11
11diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
12index 4c7ed6e..6d8c9df 100644 13index 52655cb..bb7c2ff 100644
13--- a/X11/xserver-common 14--- a/X11/xserver-common
14+++ b/X11/xserver-common 15+++ b/X11/xserver-common
15@@ -204,3 +204,8 @@ fi 16@@ -204,3 +204,8 @@ fi
@@ -21,6 +22,3 @@ index 4c7ed6e..6d8c9df 100644
21+if [ -e /etc/X11/xserver-system ] ; then 22+if [ -e /etc/X11/xserver-system ] ; then
22+ . /etc/X11/xserver-system 23+ . /etc/X11/xserver-system
23+fi 24+fi
24--
251.7.8.5
26
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
index 8791226cd..94a35407a 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
@@ -1,17 +1,18 @@
1From 63e6b9a54e1f12dbf7ddbfe3376fff4c382421a5 Mon Sep 17 00:00:00 2001 1From 492c65a32a4ae44c34580ed8ac5d3f50a155cfef Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:36:02 +0200 3Date: Wed, 11 Apr 2012 14:36:02 +0200
4Subject: [PATCH 07/12] use own functions file instead /etc/init.d/functions 4Subject: [PATCH] use own functions file instead /etc/init.d/functions
5 5
6* so we don't have to depend on initscripts 6* so we don't have to depend on initscripts
7 7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9
9--- 10---
10 Makefile | 1 + 11 Makefile | 1 +
11 X11/Xinit.d/11zaurus | 2 +- 12 X11/Xinit.d/11zaurus | 2 +-
12 X11/Xinit.d/12keymap | 2 +- 13 X11/Xinit.d/12keymap | 2 +-
13 X11/functions | 11 +++++++++++ 14 X11/functions | 11 +++++++++++
14 X11/xserver-common | 2 +- 15 X11/xserver-common | 2 +-
15 5 files changed, 15 insertions(+), 3 deletions(-) 16 5 files changed, 15 insertions(+), 3 deletions(-)
16 create mode 100644 X11/functions 17 create mode 100644 X11/functions
17 18
@@ -70,7 +71,7 @@ index 0000000..a1311ad
70+ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo 71+ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
71+} 72+}
72diff --git a/X11/xserver-common b/X11/xserver-common 73diff --git a/X11/xserver-common b/X11/xserver-common
73index 6d8c9df..de92bb7 100644 74index bb7c2ff..d622f2a 100644
74--- a/X11/xserver-common 75--- a/X11/xserver-common
75+++ b/X11/xserver-common 76+++ b/X11/xserver-common
76@@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then 77@@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then
@@ -82,6 +83,3 @@ index 6d8c9df..de92bb7 100644
82 83
83 fallback_screen_arg() { 84 fallback_screen_arg() {
84 geom=`fbset | grep geometry` 85 geom=`fbset | grep geometry`
85--
861.7.8.5
87
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
index e35e4a74a..90d0f2584 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
@@ -1,16 +1,17 @@
1From 0ee7bf87e0c83abc79de3a99dfa3c87dd5c5b229 Mon Sep 17 00:00:00 2001 1From e2abbe110e71a7b4b56564e6b9d58ffa7f34a9e8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:37:29 +0200 3Date: Wed, 11 Apr 2012 14:37:29 +0200
4Subject: [PATCH 08/12] xserver-common: add dpi and nocursor params for gta01 4Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and
5 and gta02 5 gta02
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
8--- 9---
9 X11/xserver-common | 8 ++++++-- 10 X11/xserver-common | 8 ++++++--
10 1 files changed, 6 insertions(+), 2 deletions(-) 11 1 file changed, 6 insertions(+), 2 deletions(-)
11 12
12diff --git a/X11/xserver-common b/X11/xserver-common 13diff --git a/X11/xserver-common b/X11/xserver-common
13index de92bb7..f76fa5f 100644 14index d622f2a..a2c0591 100644
14--- a/X11/xserver-common 15--- a/X11/xserver-common
15+++ b/X11/xserver-common 16+++ b/X11/xserver-common
16@@ -133,15 +133,19 @@ else 17@@ -133,15 +133,19 @@ else
@@ -35,6 +36,3 @@ index de92bb7..f76fa5f 100644
35 fi 36 fi
36 ;; 37 ;;
37 "motorola_ezx_platform") 38 "motorola_ezx_platform")
38--
391.7.8.5
40
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
index 1a0bde894..8fb69b356 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
@@ -1,16 +1,16 @@
1From 6d6caecb7172b9b33e7364564b0e6eabf67b6e8b Mon Sep 17 00:00:00 2001 1From f2d808cea5b9f69158f82e16c06f882a6db10d63 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:40:14 +0200 3Date: Wed, 11 Apr 2012 14:40:14 +0200
4Subject: [PATCH 09/12] xserver-common: add support for n900 alias 4Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board
5 nokia_rx-51_board
6 5
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8--- 8---
9 X11/xserver-common | 7 +++++++ 9 X11/xserver-common | 7 +++++++
10 1 files changed, 7 insertions(+), 0 deletions(-) 10 1 file changed, 7 insertions(+)
11 11
12diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
13index f76fa5f..86ed17f 100644 13index a2c0591..b8c37e6 100644
14--- a/X11/xserver-common 14--- a/X11/xserver-common
15+++ b/X11/xserver-common 15+++ b/X11/xserver-common
16@@ -132,6 +132,13 @@ else 16@@ -132,6 +132,13 @@ else
@@ -27,6 +27,3 @@ index f76fa5f..86ed17f 100644
27 "gta01" ) 27 "gta01" )
28 DPI="280" 28 DPI="280"
29 if [ "$XSERVER" != "Xorg" ] ; then 29 if [ "$XSERVER" != "Xorg" ] ; then
30--
311.7.8.5
32
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
index 688be40da..d30c7bbdc 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
@@ -1,15 +1,16 @@
1From 52003e6b52b1417c1a0e57243d83349addcdacf6 Mon Sep 17 00:00:00 2001 1From a194ba2013f9e58cf73cd39b57be68386e501eda Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:40:44 +0200 3Date: Wed, 11 Apr 2012 14:40:44 +0200
4Subject: [PATCH 10/12] xserver-common: add support for nexus S alias herring 4Subject: [PATCH] xserver-common: add support for nexus S alias herring
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
7--- 8---
8 X11/xserver-common | 3 +++ 9 X11/xserver-common | 3 +++
9 1 files changed, 3 insertions(+), 0 deletions(-) 10 1 file changed, 3 insertions(+)
10 11
11diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
12index 86ed17f..5c9a6eb 100644 13index b8c37e6..9aa6b24 100644
13--- a/X11/xserver-common 14--- a/X11/xserver-common
14+++ b/X11/xserver-common 15+++ b/X11/xserver-common
15@@ -126,6 +126,9 @@ else 16@@ -126,6 +126,9 @@ else
@@ -22,6 +23,3 @@ index 86ed17f..5c9a6eb 100644
22 "generic_omap1510/1610/1710") 23 "generic_omap1510/1610/1710")
23 ARGS="$ARGS -screen ${SCREEN_SIZE}" 24 ARGS="$ARGS -screen ${SCREEN_SIZE}"
24 DPI="225" ;; 25 DPI="225" ;;
25--
261.7.8.5
27
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
index f80456dfd..23e17f098 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
@@ -1,16 +1,16 @@
1From 0ecc978b7d8cb6867646fb2a29523ebef3afa016 Mon Sep 17 00:00:00 2001 1From dfd832b35b6cb4cf2b6f2b51df7b0999f10c8ca1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:41:06 +0200 3Date: Wed, 11 Apr 2012 14:41:06 +0200
4Subject: [PATCH 11/12] xserver-common: add support for nexus one alias 4Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi
5 mahimahi
6 5
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8--- 8---
9 X11/xserver-common | 3 +++ 9 X11/xserver-common | 3 +++
10 1 files changed, 3 insertions(+), 0 deletions(-) 10 1 file changed, 3 insertions(+)
11 11
12diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
13index 5c9a6eb..55594fd 100644 13index 9aa6b24..8da926e 100644
14--- a/X11/xserver-common 14--- a/X11/xserver-common
15+++ b/X11/xserver-common 15+++ b/X11/xserver-common
16@@ -129,6 +129,9 @@ else 16@@ -129,6 +129,9 @@ else
@@ -23,6 +23,3 @@ index 5c9a6eb..55594fd 100644
23 "generic_omap1510/1610/1710") 23 "generic_omap1510/1610/1710")
24 ARGS="$ARGS -screen ${SCREEN_SIZE}" 24 ARGS="$ARGS -screen ${SCREEN_SIZE}"
25 DPI="225" ;; 25 DPI="225" ;;
26--
271.7.8.5
28
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
index 54a032973..5e794f6b3 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
@@ -1,16 +1,16 @@
1From d194f0302582f1ca599f2ea58c15e15f4fd6bdef Mon Sep 17 00:00:00 2001 1From d9e05e53b30c66705852256ff5c603252aa94b2c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:41:52 +0200 3Date: Wed, 11 Apr 2012 14:41:52 +0200
4Subject: [PATCH 12/12] xserver-common: add support for gta04 alias 4Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux
5 OpenPhoenux
6 5
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8--- 8---
9 X11/xserver-common | 8 ++++++++ 9 X11/xserver-common | 8 ++++++++
10 1 files changed, 8 insertions(+), 0 deletions(-) 10 1 file changed, 8 insertions(+)
11 11
12diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
13index 55594fd..434333e 100644 13index 8da926e..d9325dd 100644
14--- a/X11/xserver-common 14--- a/X11/xserver-common
15+++ b/X11/xserver-common 15+++ b/X11/xserver-common
16@@ -161,6 +161,14 @@ else 16@@ -161,6 +161,14 @@ else
@@ -28,6 +28,3 @@ index 55594fd..434333e 100644
28 "motorola_ezx_platform") 28 "motorola_ezx_platform")
29 ARGS="$ARGS -screen 240x320" 29 ARGS="$ARGS -screen 240x320"
30 DPI="170" ;; 30 DPI="170" ;;
31--
321.7.8.5
33
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
index 49321eb42..78d2e4029 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
@@ -1,13 +1,13 @@
1From 176c3bd3d86c223fd44b0f15b62d38526bb3b0d2 Mon Sep 17 00:00:00 2001 1From 57ab521ffc1024f21105ca14be2d041a477942b1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 17 Aug 2012 13:00:56 +0200 3Date: Fri, 17 Aug 2012 13:00:56 +0200
4Subject: [PATCH 13/13] xserver-common: add support for tuna alias Galaxy 4Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus
5 Nexus
6 5
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8--- 8---
9 X11/xserver-common | 8 ++++++++ 9 X11/xserver-common | 8 ++++++++
10 1 files changed, 8 insertions(+), 0 deletions(-) 10 1 file changed, 8 insertions(+)
11 11
12diff --git a/X11/xserver-common b/X11/xserver-common 12diff --git a/X11/xserver-common b/X11/xserver-common
13index d9325dd..017e5ae 100644 13index d9325dd..017e5ae 100644
@@ -28,6 +28,3 @@ index d9325dd..017e5ae 100644
28 "motorola_ezx_platform") 28 "motorola_ezx_platform")
29 ARGS="$ARGS -screen 240x320" 29 ARGS="$ARGS -screen 240x320"
30 DPI="170" ;; 30 DPI="170" ;;
31--
321.7.8.6
33
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
index 06df2618b..a73191700 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
@@ -1,3 +1,4 @@
1From 5236209e30e0f45113e140f0667c8ffcfe621536 Mon Sep 17 00:00:00 2001
1From: Javier Viguera <javier.viguera@digi.com> 2From: Javier Viguera <javier.viguera@digi.com>
2Date: Wed, 26 Nov 2014 09:24:44 +0100 3Date: Wed, 26 Nov 2014 09:24:44 +0100
3Subject: [PATCH] xserver-common: disable TCP connections 4Subject: [PATCH] xserver-common: disable TCP connections
@@ -5,12 +6,13 @@ Subject: [PATCH] xserver-common: disable TCP connections
5Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
6 7
7Signed-off-by: Javier Viguera <javier.viguera@digi.com> 8Signed-off-by: Javier Viguera <javier.viguera@digi.com>
9
8--- 10---
9 X11/xserver-common | 2 +- 11 X11/xserver-common | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
11 13
12diff --git a/X11/xserver-common b/X11/xserver-common 14diff --git a/X11/xserver-common b/X11/xserver-common
13index 017e5aee1ab0..4dc48c412741 100644 15index 017e5ae..4dc48c4 100644
14--- a/X11/xserver-common 16--- a/X11/xserver-common
15+++ b/X11/xserver-common 17+++ b/X11/xserver-common
16@@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg` 18@@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`