summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-11-15 13:41:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:05 +0000
commitdc7f4a5bf8d99280ef67301008b9878dbb43d05b (patch)
tree03104230d15d4fecf625ad788e3ce60d85f69d68
parentc63811fa5b28b34edf3b34cdcc68b364dacbaa1b (diff)
downloadpoky-dc7f4a5bf8d99280ef67301008b9878dbb43d05b.tar.gz
x11-common: Merge into xserver-nodm-init
Move the (non-factual) x utils dependencies from x11-common to x11 packagegroup. Remove some obsolete configuration from x11-common: * Xsession.d/12keymap.sh: commented out xmodmap call for kdrive * default.xmodmap: xmodmap file used by 12keymap.sh * Xdefaults: rxvt configuration At this point x11-common is just /etc/X11/Xsession and three non-intrusive Xsession scripts: make these explicitly part of xserver-nodm-init. RCONFLICT with the versions of xserver-common that also provide these files. VIRTUAL-RUNTIME_xserver_common is no longer a real abstraction but preserve the setting for backwards compatibility (if the variable is set to "xserver-common", the right thing still happens). (From OE-Core rev: ee153327b046fe8474e498f39ecc87e573bc8604) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb9
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults3
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh4
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap260
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch355
-rw-r--r--meta/recipes-graphics/x11-common/x11-common_0.1.bb22
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession (renamed from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession)0
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh (renamed from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh)0
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh (renamed from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh)0
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh (renamed from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh)0
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb5
12 files changed, 11 insertions, 648 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 10efb096f0..a59265a21e 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -400,7 +400,6 @@ DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston"
400DISTRO_PN_ALIAS_pn-weston-init = "OE-Core" 400DISTRO_PN_ALIAS_pn-weston-init = "OE-Core"
401DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which" 401DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
402DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" 402DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant"
403DISTRO_PN_ALIAS_pn-x11-common = "OE-Core"
404DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" 403DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps"
405DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" 404DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util"
406DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" 405DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 42914246dc..001db9e5e2 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -5,13 +5,12 @@
5PR = "r40" 5PR = "r40"
6 6
7inherit packagegroup distro_features_check 7inherit packagegroup distro_features_check
8# rdepends on x11-common
9REQUIRED_DISTRO_FEATURES = "x11" 8REQUIRED_DISTRO_FEATURES = "x11"
10 9
11PACKAGES = "${PN} ${PN}-utils" 10PACKAGES = "${PN} ${PN}-utils"
12 11
13# xserver-common, x11-common 12# backwards compatibility for xserver-common
14VIRTUAL-RUNTIME_xserver_common ?= "x11-common" 13VIRTUAL-RUNTIME_xserver_common ?= ""
15 14
16# elsa, xserver-nodm-init 15# elsa, xserver-nodm-init
17VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" 16VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
@@ -30,4 +29,8 @@ RDEPENDS_${PN}-utils = "\
30 xhost \ 29 xhost \
31 xset \ 30 xset \
32 xrandr \ 31 xrandr \
32 xmodmap \
33 xdpyinfo \
34 xinput-calibrator \
35 dbus-x11 \
33 " 36 "
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
deleted file mode 100644
index f5b69dd516..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
+++ /dev/null
@@ -1,3 +0,0 @@
1Rxvt*scrollBar_right: true
2Rxvt*font: xft:Mono:pixelsize=9
3
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
deleted file mode 100644
index a9d102c746..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3# kdrive 1.4 does not have default keymap in server
4#xmodmap - </etc/X11/default.xmodmap
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap b/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
deleted file mode 100644
index 05a13fa3c8..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
+++ /dev/null
@@ -1,260 +0,0 @@
1keycode 8 =
2keycode 9 = Escape
3keycode 10 = 1 exclam
4keycode 11 = 2 at
5keycode 12 = 3 numbersign
6keycode 13 = 4 dollar
7keycode 14 = 5 percent
8keycode 15 = 6 asciicircum
9keycode 16 = 7 ampersand braceleft
10keycode 17 = 8 asterisk bracketleft
11keycode 18 = 9 parenleft bracketright
12keycode 19 = 0 parenright braceright
13keycode 20 = minus underscore backslash
14keycode 21 = equal plus
15keycode 22 = BackSpace
16keycode 23 = Tab
17keycode 24 = q Q q
18keycode 25 = w W w
19keycode 26 = e E
20keycode 27 = r R r
21keycode 28 = t T t
22keycode 29 = y Y y
23keycode 30 = u U u
24keycode 31 = i I i
25keycode 32 = o O o
26keycode 33 = p P p
27keycode 34 = bracketleft braceleft
28keycode 35 = bracketright braceright asciitilde
29keycode 36 = Return
30keycode 37 = Control_L
31keycode 38 = a A
32keycode 39 = s S s
33keycode 40 = d D
34keycode 41 = f F
35keycode 42 = g G g
36keycode 43 = h H h
37keycode 44 = j J j
38keycode 45 = k K k
39keycode 46 = l L l
40keycode 47 = semicolon colon
41keycode 48 = apostrophe quotedbl
42keycode 49 = grave asciitilde
43keycode 50 = Shift_L
44keycode 51 = backslash bar
45keycode 52 = z Z z
46keycode 53 = x X x
47keycode 54 = c C
48keycode 55 = v V v
49keycode 56 = b B
50keycode 57 = n N n
51keycode 58 = m M m
52keycode 59 = comma less
53keycode 60 = period greater
54keycode 61 = slash question
55keycode 62 = Shift_R
56keycode 63 = KP_Multiply
57keycode 64 = Alt_L
58keycode 65 = space
59keycode 66 = Caps_Lock
60keycode 67 = F1 F11
61keycode 68 = F2 F12
62keycode 69 = F3 F13
63keycode 70 = F4 F14
64keycode 71 = F5 F15
65keycode 72 = F6 F16
66keycode 73 = F7 F17
67keycode 74 = F8 F18
68keycode 75 = F9 F19
69keycode 76 = F10 F20
70keycode 77 = Num_Lock
71keycode 78 = Scroll_Lock
72keycode 79 = KP_7
73keycode 80 = KP_8
74keycode 81 = KP_9
75keycode 82 = KP_Subtract
76keycode 83 = KP_4
77keycode 84 = KP_5
78keycode 85 = KP_6
79keycode 86 = KP_Add
80keycode 87 = KP_1
81keycode 88 = KP_2
82keycode 89 = KP_3
83keycode 90 = KP_0
84keycode 91 = KP_Decimal
85keycode 92 =
86keycode 93 =
87keycode 94 = less greater bar
88keycode 95 = F11
89keycode 96 = F12
90keycode 97 =
91keycode 98 =
92keycode 99 =
93keycode 100 =
94keycode 101 =
95keycode 102 =
96keycode 103 =
97keycode 104 = KP_Enter
98keycode 105 = Control_R
99keycode 106 = KP_Divide
100keycode 107 =
101keycode 108 = Mode_switch
102keycode 109 = Break
103keycode 110 = Home
104keycode 111 = Up
105keycode 112 = Prior
106keycode 113 = Left
107keycode 114 = Right
108keycode 115 = End
109keycode 116 = Down
110keycode 117 = Next
111keycode 118 = Insert
112keycode 119 = Delete
113keycode 120 = Menu
114keycode 121 = F13
115keycode 122 = F14
116keycode 123 = Help
117keycode 124 = Execute
118keycode 125 = F17
119keycode 126 = KP_Subtract
120keycode 127 = Pause
121keycode 128 =
122keycode 129 =
123keycode 130 =
124keycode 131 =
125keycode 132 =
126keycode 133 =
127keycode 134 =
128keycode 135 =
129keycode 136 =
130keycode 137 =
131keycode 138 =
132keycode 139 =
133keycode 140 =
134keycode 141 =
135keycode 142 =
136keycode 143 =
137keycode 144 =
138keycode 145 =
139keycode 146 =
140keycode 147 =
141keycode 148 =
142keycode 149 =
143keycode 150 =
144keycode 151 =
145keycode 152 =
146keycode 153 =
147keycode 154 =
148keycode 155 =
149keycode 156 =
150keycode 157 =
151keycode 158 =
152keycode 159 =
153keycode 160 =
154keycode 161 =
155keycode 162 =
156keycode 163 =
157keycode 164 =
158keycode 165 =
159keycode 166 =
160keycode 167 =
161keycode 168 =
162keycode 169 =
163keycode 170 =
164keycode 171 =
165keycode 172 =
166keycode 173 =
167keycode 174 =
168keycode 175 =
169keycode 176 =
170keycode 177 =
171keycode 178 =
172keycode 179 =
173keycode 180 =
174keycode 181 =
175keycode 182 =
176keycode 183 =
177keycode 184 =
178keycode 185 =
179keycode 186 =
180keycode 187 =
181keycode 188 =
182keycode 189 =
183keycode 190 =
184keycode 191 =
185keycode 192 =
186keycode 193 =
187keycode 194 =
188keycode 195 =
189keycode 196 =
190keycode 197 =
191keycode 198 =
192keycode 199 =
193keycode 200 =
194keycode 201 =
195keycode 202 =
196keycode 203 =
197keycode 204 =
198keycode 205 =
199keycode 206 =
200keycode 207 =
201keycode 208 =
202keycode 209 =
203keycode 210 =
204keycode 211 =
205keycode 212 =
206keycode 213 =
207keycode 214 =
208keycode 215 =
209keycode 216 =
210keycode 217 =
211keycode 218 =
212keycode 219 =
213keycode 220 =
214keycode 221 =
215keycode 222 =
216keycode 223 =
217keycode 224 =
218keycode 225 =
219keycode 226 =
220keycode 227 =
221keycode 228 =
222keycode 229 =
223keycode 230 =
224keycode 231 =
225keycode 232 =
226keycode 233 =
227keycode 234 =
228keycode 235 =
229keycode 236 =
230keycode 237 =
231keycode 238 =
232keycode 239 =
233keycode 240 =
234keycode 241 =
235keycode 242 =
236keycode 243 =
237keycode 244 =
238keycode 245 =
239keycode 246 =
240keycode 247 =
241keycode 248 =
242keycode 249 =
243keycode 250 =
244keycode 251 =
245keycode 252 =
246keycode 253 =
247keycode 254 =
248
249add shift = Shift_L
250add shift = Shift_R
251add shift = Menu
252add lock = Caps_Lock
253add control = Control_L
254add control = Control_R
255add mod1 = Alt_L
256add mod2 = Num_Lock
257!mod3
258add mod4 = Mode_switch
259!mod5
260
diff --git a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
deleted file mode 100644
index eff975e341..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
+++ /dev/null
@@ -1,355 +0,0 @@
1COPYING: add GPLv2 license file
2
3this is a local file recipe and the license file is missing.In order
4to pass the license checksum checking, the license file is needed. So
5this patch add the GPLv2 license file.
6
7Upstream-Status: Inappropriate [licensing]
8
9Signed-off-by: Yu Ke <ke.yu@intel.com>
10
11diff --git a/COPYING b/COPYING
12new file mode 100644
13index 0000000..d511905
14--- /dev/null
15+++ b/COPYING
16@@ -0,0 +1,339 @@
17+ GNU GENERAL PUBLIC LICENSE
18+ Version 2, June 1991
19+
20+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
21+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22+ Everyone is permitted to copy and distribute verbatim copies
23+ of this license document, but changing it is not allowed.
24+
25+ Preamble
26+
27+ The licenses for most software are designed to take away your
28+freedom to share and change it. By contrast, the GNU General Public
29+License is intended to guarantee your freedom to share and change free
30+software--to make sure the software is free for all its users. This
31+General Public License applies to most of the Free Software
32+Foundation's software and to any other program whose authors commit to
33+using it. (Some other Free Software Foundation software is covered by
34+the GNU Lesser General Public License instead.) You can apply it to
35+your programs, too.
36+
37+ When we speak of free software, we are referring to freedom, not
38+price. Our General Public Licenses are designed to make sure that you
39+have the freedom to distribute copies of free software (and charge for
40+this service if you wish), that you receive source code or can get it
41+if you want it, that you can change the software or use pieces of it
42+in new free programs; and that you know you can do these things.
43+
44+ To protect your rights, we need to make restrictions that forbid
45+anyone to deny you these rights or to ask you to surrender the rights.
46+These restrictions translate to certain responsibilities for you if you
47+distribute copies of the software, or if you modify it.
48+
49+ For example, if you distribute copies of such a program, whether
50+gratis or for a fee, you must give the recipients all the rights that
51+you have. You must make sure that they, too, receive or can get the
52+source code. And you must show them these terms so they know their
53+rights.
54+
55+ We protect your rights with two steps: (1) copyright the software, and
56+(2) offer you this license which gives you legal permission to copy,
57+distribute and/or modify the software.
58+
59+ Also, for each author's protection and ours, we want to make certain
60+that everyone understands that there is no warranty for this free
61+software. If the software is modified by someone else and passed on, we
62+want its recipients to know that what they have is not the original, so
63+that any problems introduced by others will not reflect on the original
64+authors' reputations.
65+
66+ Finally, any free program is threatened constantly by software
67+patents. We wish to avoid the danger that redistributors of a free
68+program will individually obtain patent licenses, in effect making the
69+program proprietary. To prevent this, we have made it clear that any
70+patent must be licensed for everyone's free use or not licensed at all.
71+
72+ The precise terms and conditions for copying, distribution and
73+modification follow.
74+
75+ GNU GENERAL PUBLIC LICENSE
76+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
77+
78+ 0. This License applies to any program or other work which contains
79+a notice placed by the copyright holder saying it may be distributed
80+under the terms of this General Public License. The "Program", below,
81+refers to any such program or work, and a "work based on the Program"
82+means either the Program or any derivative work under copyright law:
83+that is to say, a work containing the Program or a portion of it,
84+either verbatim or with modifications and/or translated into another
85+language. (Hereinafter, translation is included without limitation in
86+the term "modification".) Each licensee is addressed as "you".
87+
88+Activities other than copying, distribution and modification are not
89+covered by this License; they are outside its scope. The act of
90+running the Program is not restricted, and the output from the Program
91+is covered only if its contents constitute a work based on the
92+Program (independent of having been made by running the Program).
93+Whether that is true depends on what the Program does.
94+
95+ 1. You may copy and distribute verbatim copies of the Program's
96+source code as you receive it, in any medium, provided that you
97+conspicuously and appropriately publish on each copy an appropriate
98+copyright notice and disclaimer of warranty; keep intact all the
99+notices that refer to this License and to the absence of any warranty;
100+and give any other recipients of the Program a copy of this License
101+along with the Program.
102+
103+You may charge a fee for the physical act of transferring a copy, and
104+you may at your option offer warranty protection in exchange for a fee.
105+
106+ 2. You may modify your copy or copies of the Program or any portion
107+of it, thus forming a work based on the Program, and copy and
108+distribute such modifications or work under the terms of Section 1
109+above, provided that you also meet all of these conditions:
110+
111+ a) You must cause the modified files to carry prominent notices
112+ stating that you changed the files and the date of any change.
113+
114+ b) You must cause any work that you distribute or publish, that in
115+ whole or in part contains or is derived from the Program or any
116+ part thereof, to be licensed as a whole at no charge to all third
117+ parties under the terms of this License.
118+
119+ c) If the modified program normally reads commands interactively
120+ when run, you must cause it, when started running for such
121+ interactive use in the most ordinary way, to print or display an
122+ announcement including an appropriate copyright notice and a
123+ notice that there is no warranty (or else, saying that you provide
124+ a warranty) and that users may redistribute the program under
125+ these conditions, and telling the user how to view a copy of this
126+ License. (Exception: if the Program itself is interactive but
127+ does not normally print such an announcement, your work based on
128+ the Program is not required to print an announcement.)
129+
130+These requirements apply to the modified work as a whole. If
131+identifiable sections of that work are not derived from the Program,
132+and can be reasonably considered independent and separate works in
133+themselves, then this License, and its terms, do not apply to those
134+sections when you distribute them as separate works. But when you
135+distribute the same sections as part of a whole which is a work based
136+on the Program, the distribution of the whole must be on the terms of
137+this License, whose permissions for other licensees extend to the
138+entire whole, and thus to each and every part regardless of who wrote it.
139+
140+Thus, it is not the intent of this section to claim rights or contest
141+your rights to work written entirely by you; rather, the intent is to
142+exercise the right to control the distribution of derivative or
143+collective works based on the Program.
144+
145+In addition, mere aggregation of another work not based on the Program
146+with the Program (or with a work based on the Program) on a volume of
147+a storage or distribution medium does not bring the other work under
148+the scope of this License.
149+
150+ 3. You may copy and distribute the Program (or a work based on it,
151+under Section 2) in object code or executable form under the terms of
152+Sections 1 and 2 above provided that you also do one of the following:
153+
154+ a) Accompany it with the complete corresponding machine-readable
155+ source code, which must be distributed under the terms of Sections
156+ 1 and 2 above on a medium customarily used for software interchange; or,
157+
158+ b) Accompany it with a written offer, valid for at least three
159+ years, to give any third party, for a charge no more than your
160+ cost of physically performing source distribution, a complete
161+ machine-readable copy of the corresponding source code, to be
162+ distributed under the terms of Sections 1 and 2 above on a medium
163+ customarily used for software interchange; or,
164+
165+ c) Accompany it with the information you received as to the offer
166+ to distribute corresponding source code. (This alternative is
167+ allowed only for noncommercial distribution and only if you
168+ received the program in object code or executable form with such
169+ an offer, in accord with Subsection b above.)
170+
171+The source code for a work means the preferred form of the work for
172+making modifications to it. For an executable work, complete source
173+code means all the source code for all modules it contains, plus any
174+associated interface definition files, plus the scripts used to
175+control compilation and installation of the executable. However, as a
176+special exception, the source code distributed need not include
177+anything that is normally distributed (in either source or binary
178+form) with the major components (compiler, kernel, and so on) of the
179+operating system on which the executable runs, unless that component
180+itself accompanies the executable.
181+
182+If distribution of executable or object code is made by offering
183+access to copy from a designated place, then offering equivalent
184+access to copy the source code from the same place counts as
185+distribution of the source code, even though third parties are not
186+compelled to copy the source along with the object code.
187+
188+ 4. You may not copy, modify, sublicense, or distribute the Program
189+except as expressly provided under this License. Any attempt
190+otherwise to copy, modify, sublicense or distribute the Program is
191+void, and will automatically terminate your rights under this License.
192+However, parties who have received copies, or rights, from you under
193+this License will not have their licenses terminated so long as such
194+parties remain in full compliance.
195+
196+ 5. You are not required to accept this License, since you have not
197+signed it. However, nothing else grants you permission to modify or
198+distribute the Program or its derivative works. These actions are
199+prohibited by law if you do not accept this License. Therefore, by
200+modifying or distributing the Program (or any work based on the
201+Program), you indicate your acceptance of this License to do so, and
202+all its terms and conditions for copying, distributing or modifying
203+the Program or works based on it.
204+
205+ 6. Each time you redistribute the Program (or any work based on the
206+Program), the recipient automatically receives a license from the
207+original licensor to copy, distribute or modify the Program subject to
208+these terms and conditions. You may not impose any further
209+restrictions on the recipients' exercise of the rights granted herein.
210+You are not responsible for enforcing compliance by third parties to
211+this License.
212+
213+ 7. If, as a consequence of a court judgment or allegation of patent
214+infringement or for any other reason (not limited to patent issues),
215+conditions are imposed on you (whether by court order, agreement or
216+otherwise) that contradict the conditions of this License, they do not
217+excuse you from the conditions of this License. If you cannot
218+distribute so as to satisfy simultaneously your obligations under this
219+License and any other pertinent obligations, then as a consequence you
220+may not distribute the Program at all. For example, if a patent
221+license would not permit royalty-free redistribution of the Program by
222+all those who receive copies directly or indirectly through you, then
223+the only way you could satisfy both it and this License would be to
224+refrain entirely from distribution of the Program.
225+
226+If any portion of this section is held invalid or unenforceable under
227+any particular circumstance, the balance of the section is intended to
228+apply and the section as a whole is intended to apply in other
229+circumstances.
230+
231+It is not the purpose of this section to induce you to infringe any
232+patents or other property right claims or to contest validity of any
233+such claims; this section has the sole purpose of protecting the
234+integrity of the free software distribution system, which is
235+implemented by public license practices. Many people have made
236+generous contributions to the wide range of software distributed
237+through that system in reliance on consistent application of that
238+system; it is up to the author/donor to decide if he or she is willing
239+to distribute software through any other system and a licensee cannot
240+impose that choice.
241+
242+This section is intended to make thoroughly clear what is believed to
243+be a consequence of the rest of this License.
244+
245+ 8. If the distribution and/or use of the Program is restricted in
246+certain countries either by patents or by copyrighted interfaces, the
247+original copyright holder who places the Program under this License
248+may add an explicit geographical distribution limitation excluding
249+those countries, so that distribution is permitted only in or among
250+countries not thus excluded. In such case, this License incorporates
251+the limitation as if written in the body of this License.
252+
253+ 9. The Free Software Foundation may publish revised and/or new versions
254+of the General Public License from time to time. Such new versions will
255+be similar in spirit to the present version, but may differ in detail to
256+address new problems or concerns.
257+
258+Each version is given a distinguishing version number. If the Program
259+specifies a version number of this License which applies to it and "any
260+later version", you have the option of following the terms and conditions
261+either of that version or of any later version published by the Free
262+Software Foundation. If the Program does not specify a version number of
263+this License, you may choose any version ever published by the Free Software
264+Foundation.
265+
266+ 10. If you wish to incorporate parts of the Program into other free
267+programs whose distribution conditions are different, write to the author
268+to ask for permission. For software which is copyrighted by the Free
269+Software Foundation, write to the Free Software Foundation; we sometimes
270+make exceptions for this. Our decision will be guided by the two goals
271+of preserving the free status of all derivatives of our free software and
272+of promoting the sharing and reuse of software generally.
273+
274+ NO WARRANTY
275+
276+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
277+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
278+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
279+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
280+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
281+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
282+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
283+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
284+REPAIR OR CORRECTION.
285+
286+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
287+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
288+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
289+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
290+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
291+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
292+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
293+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
294+POSSIBILITY OF SUCH DAMAGES.
295+
296+ END OF TERMS AND CONDITIONS
297+
298+ How to Apply These Terms to Your New Programs
299+
300+ If you develop a new program, and you want it to be of the greatest
301+possible use to the public, the best way to achieve this is to make it
302+free software which everyone can redistribute and change under these terms.
303+
304+ To do so, attach the following notices to the program. It is safest
305+to attach them to the start of each source file to most effectively
306+convey the exclusion of warranty; and each file should have at least
307+the "copyright" line and a pointer to where the full notice is found.
308+
309+ <one line to give the program's name and a brief idea of what it does.>
310+ Copyright (C) <year> <name of author>
311+
312+ This program is free software; you can redistribute it and/or modify
313+ it under the terms of the GNU General Public License as published by
314+ the Free Software Foundation; either version 2 of the License, or
315+ (at your option) any later version.
316+
317+ This program is distributed in the hope that it will be useful,
318+ but WITHOUT ANY WARRANTY; without even the implied warranty of
319+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
320+ GNU General Public License for more details.
321+
322+ You should have received a copy of the GNU General Public License along
323+ with this program; if not, write to the Free Software Foundation, Inc.,
324+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
325+
326+Also add information on how to contact you by electronic and paper mail.
327+
328+If the program is interactive, make it output a short notice like this
329+when it starts in an interactive mode:
330+
331+ Gnomovision version 69, Copyright (C) year name of author
332+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
333+ This is free software, and you are welcome to redistribute it
334+ under certain conditions; type `show c' for details.
335+
336+The hypothetical commands `show w' and `show c' should show the appropriate
337+parts of the General Public License. Of course, the commands you use may
338+be called something other than `show w' and `show c'; they could even be
339+mouse-clicks or menu items--whatever suits your program.
340+
341+You should also get your employer (if you work as a programmer) or your
342+school, if any, to sign a "copyright disclaimer" for the program, if
343+necessary. Here is a sample; alter the names:
344+
345+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
346+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
347+
348+ <signature of Ty Coon>, 1 April 1989
349+ Ty Coon, President of Vice
350+
351+This General Public License does not permit incorporating your program into
352+proprietary programs. If your program is a subroutine library, you may
353+consider it more useful to permit linking proprietary applications with the
354+library. If this is what you want to do, use the GNU Lesser General
355+Public License instead of this License.
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
deleted file mode 100644
index ab9a939ce0..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "Common X11 scripts and configuration files"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4SECTION = "x11"
5PR = "r47"
6
7inherit distro_features_check
8# rdepends on xdypinfo xmodmap xinit
9REQUIRED_DISTRO_FEATURES = "x11"
10
11SRC_URI = "file://etc \
12 file://gplv2-license.patch"
13
14S = "${WORKDIR}"
15
16do_install() {
17 cp -R ${S}/etc ${D}${sysconfdir}
18 chmod -R 755 ${D}${sysconfdir}
19}
20
21RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor"
22
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
index 0b73127ae1..0b73127ae1 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
index 6bd40b2fc5..6bd40b2fc5 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
index 3d7008ca45..3d7008ca45 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
index b936dedf3b..b936dedf3b 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
index a6d0d5eeea..62da11800c 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
@@ -6,6 +6,7 @@ PR = "r31"
6 6
7SRC_URI = "file://xserver-nodm \ 7SRC_URI = "file://xserver-nodm \
8 file://Xserver \ 8 file://Xserver \
9 file://X11 \
9 file://gplv2-license.patch \ 10 file://gplv2-license.patch \
10 file://xserver-nodm.service.in \ 11 file://xserver-nodm.service.in \
11 file://xserver-nodm.conf.in \ 12 file://xserver-nodm.conf.in \
@@ -29,6 +30,9 @@ do_install() {
29 install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm 30 install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm
30 install -d ${D}${sysconfdir}/xserver-nodm 31 install -d ${D}${sysconfdir}/xserver-nodm
31 install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver 32 install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver
33 install -d ${D}${sysconfdir}/X11/Xsession.d
34 install X11/Xsession.d/* ${D}${sysconfdir}/X11/Xsession.d/
35 install X11/Xsession ${D}${sysconfdir}/X11/
32 36
33 BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" 37 BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}"
34 if [ "${ROOTLESS_X}" = "1" ] ; then 38 if [ "${ROOTLESS_X}" = "1" ] ; then
@@ -59,3 +63,4 @@ INITSCRIPT_NAME = "xserver-nodm"
59INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." 63INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ."
60SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" 64SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
61 65
66RCONFLICTS_${PN} = "xserver-common (< 1.34-r9) x11-common"