summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
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/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
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/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch')
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch20
1 files changed, 9 insertions, 11 deletions
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 8791226cdd..94a35407af 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