summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-compat-units.bb59
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service16
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service17
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-serialgetty.bb46
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE339
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service32
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb18
-rwxr-xr-xmeta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl126
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch103
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch91
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/gtk-doc.make230
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/modprobe.rules17
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/optional_secure_getenv.patch19
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch26
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch26
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch82
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch35
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch166
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch335
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/touchscreen.rules18
-rw-r--r--meta-systemd/recipes-core/systemd/systemd/var-run.conf4
-rw-r--r--meta-systemd/recipes-core/systemd/systemd_git.bb263
22 files changed, 0 insertions, 2068 deletions
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
deleted file mode 100644
index 6b6b4dda98..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
+++ /dev/null
@@ -1,59 +0,0 @@
1DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts"
2
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5
6PR = "r18"
7
8inherit allarch
9
10SRC_URI = "file://*.service"
11
12do_install() {
13 install -d ${D}${systemd_unitdir}/system/basic.target.wants
14 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
15 install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
16 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
17 ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
18
19 install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
20 ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
21 ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
22
23 # hack to make old style sysvinit postinsts succeed
24 install -d ${D}${bindir}
25 echo "echo 1" > ${D}${bindir}/runlevel
26 chmod 0755 ${D}${bindir}/runlevel
27}
28
29SYSTEMD_DISABLED_SYSV_SERVICES = " \
30 busybox-udhcpc \
31 dnsmasq \
32 hwclock \
33 networking \
34 syslog \
35 syslog.busybox \
36"
37
38pkg_postinst_${PN} () {
39cd $D${sysconfdir}/init.d
40
41echo "Disabling the following sysv scripts: "
42
43OPTS=""
44
45if [ -n "$D" ]; then
46 OPTS="--root=$D"
47fi
48
49for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
50 if [ \( -e $i -o $i.sh \) -a ! -e $D${sysconfdir}/systemd/system/$i.service ] ; then
51 echo -n "$i: " ; systemctl ${OPTS} mask $i.service
52 fi
53done ; echo
54}
55
56FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
57RDPEPENDS_${PN} = "systemd"
58
59
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service b/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service
deleted file mode 100644
index cab8f76ab8..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service
+++ /dev/null
@@ -1,16 +0,0 @@
1[Unit]
2Description=Machine ID first boot configure
3DefaultDependencies=no
4ConditionPathExists=|!/etc/machine-id
5After=remount-rootfs.service
6Before=sysinit.target
7
8[Service]
9ExecStart=/bin/systemd-machine-id-setup
10RemainAfterExit=No
11Type=oneshot
12StandardOutput=syslog
13
14[Install]
15WantedBy=basic.target
16WantedBy=sysinit.target
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service
deleted file mode 100644
index da6fe76a38..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service
+++ /dev/null
@@ -1,17 +0,0 @@
1[Unit]
2Description=Run pending postinsts
3DefaultDependencies=no
4ConditionPathExists=|/etc/rcS.d/S98run-postinsts
5After=remount-rootfs.service tmp.mount
6Before=sysinit.target
7
8[Service]
9ExecStart=/etc/rcS.d/S98run-postinsts
10RemainAfterExit=No
11Type=oneshot
12StandardOutput=syslog
13TimeoutSec=0
14
15[Install]
16WantedBy=basic.target
17WantedBy=sysinit.target
diff --git a/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb b/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb
deleted file mode 100644
index c3106722f6..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb
+++ /dev/null
@@ -1,46 +0,0 @@
1DESCRIPTION = "Systemd serial config"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe"
4
5PR = "r3"
6
7SERIAL_CONSOLE ?= "115200 ttyS0"
8
9SRC_URI = "file://LICENSE \
10 file://serial-getty@.service"
11
12def get_serial_console_value(d, index):
13 c = d.getVar('SERIAL_CONSOLE', True)
14
15 if len(c):
16 return c.split()[index]
17
18 return ""
19
20def get_baudrate(d):
21 return get_serial_console_value(d, 0)
22
23def get_console(d):
24 return get_serial_console_value(d, 1)
25
26do_install() {
27 if [ ! ${@get_baudrate(d)} = "" ]; then
28 sed -i -e s/\@BAUDRATE\@/${@get_baudrate(d)}/g ${WORKDIR}/serial-getty@.service
29 install -d ${D}${systemd_unitdir}/system/
30 install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
31 install ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/
32
33 # enable the service
34 ln -sf ${systemd_unitdir}/system/serial-getty@.service \
35 ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(d)}.service
36 fi
37}
38
39PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
40
41RRECOMMENDS_${PN} = ""
42RDEPENDS_${PN} = "systemd"
43
44# This is a machine specific file
45FILES_${PN} = "${systemd_unitdir}/system/serial-getty@.service ${sysconfdir}"
46PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE b/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE
deleted file mode 100644
index d511905c16..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 1991
3
4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6 Everyone is permitted to copy and distribute verbatim copies
7 of this license document, but changing it is not allowed.
8
9 Preamble
10
11 The licenses for most software are designed to take away your
12freedom to share and change it. By contrast, the GNU General Public
13License is intended to guarantee your freedom to share and change free
14software--to make sure the software is free for all its users. This
15General Public License applies to most of the Free Software
16Foundation's software and to any other program whose authors commit to
17using it. (Some other Free Software Foundation software is covered by
18the GNU Lesser General Public License instead.) You can apply it to
19your programs, too.
20
21 When we speak of free software, we are referring to freedom, not
22price. Our General Public Licenses are designed to make sure that you
23have the freedom to distribute copies of free software (and charge for
24this service if you wish), that you receive source code or can get it
25if you want it, that you can change the software or use pieces of it
26in new free programs; and that you know you can do these things.
27
28 To protect your rights, we need to make restrictions that forbid
29anyone to deny you these rights or to ask you to surrender the rights.
30These restrictions translate to certain responsibilities for you if you
31distribute copies of the software, or if you modify it.
32
33 For example, if you distribute copies of such a program, whether
34gratis or for a fee, you must give the recipients all the rights that
35you have. You must make sure that they, too, receive or can get the
36source code. And you must show them these terms so they know their
37rights.
38
39 We protect your rights with two steps: (1) copyright the software, and
40(2) offer you this license which gives you legal permission to copy,
41distribute and/or modify the software.
42
43 Also, for each author's protection and ours, we want to make certain
44that everyone understands that there is no warranty for this free
45software. If the software is modified by someone else and passed on, we
46want its recipients to know that what they have is not the original, so
47that any problems introduced by others will not reflect on the original
48authors' reputations.
49
50 Finally, any free program is threatened constantly by software
51patents. We wish to avoid the danger that redistributors of a free
52program will individually obtain patent licenses, in effect making the
53program proprietary. To prevent this, we have made it clear that any
54patent must be licensed for everyone's free use or not licensed at all.
55
56 The precise terms and conditions for copying, distribution and
57modification follow.
58
59 GNU GENERAL PUBLIC LICENSE
60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
62 0. This License applies to any program or other work which contains
63a notice placed by the copyright holder saying it may be distributed
64under the terms of this General Public License. The "Program", below,
65refers to any such program or work, and a "work based on the Program"
66means either the Program or any derivative work under copyright law:
67that is to say, a work containing the Program or a portion of it,
68either verbatim or with modifications and/or translated into another
69language. (Hereinafter, translation is included without limitation in
70the term "modification".) Each licensee is addressed as "you".
71
72Activities other than copying, distribution and modification are not
73covered by this License; they are outside its scope. The act of
74running the Program is not restricted, and the output from the Program
75is covered only if its contents constitute a work based on the
76Program (independent of having been made by running the Program).
77Whether that is true depends on what the Program does.
78
79 1. You may copy and distribute verbatim copies of the Program's
80source code as you receive it, in any medium, provided that you
81conspicuously and appropriately publish on each copy an appropriate
82copyright notice and disclaimer of warranty; keep intact all the
83notices that refer to this License and to the absence of any warranty;
84and give any other recipients of the Program a copy of this License
85along with the Program.
86
87You may charge a fee for the physical act of transferring a copy, and
88you may at your option offer warranty protection in exchange for a fee.
89
90 2. You may modify your copy or copies of the Program or any portion
91of it, thus forming a work based on the Program, and copy and
92distribute such modifications or work under the terms of Section 1
93above, provided that you also meet all of these conditions:
94
95 a) You must cause the modified files to carry prominent notices
96 stating that you changed the files and the date of any change.
97
98 b) You must cause any work that you distribute or publish, that in
99 whole or in part contains or is derived from the Program or any
100 part thereof, to be licensed as a whole at no charge to all third
101 parties under the terms of this License.
102
103 c) If the modified program normally reads commands interactively
104 when run, you must cause it, when started running for such
105 interactive use in the most ordinary way, to print or display an
106 announcement including an appropriate copyright notice and a
107 notice that there is no warranty (or else, saying that you provide
108 a warranty) and that users may redistribute the program under
109 these conditions, and telling the user how to view a copy of this
110 License. (Exception: if the Program itself is interactive but
111 does not normally print such an announcement, your work based on
112 the Program is not required to print an announcement.)
113
114These requirements apply to the modified work as a whole. If
115identifiable sections of that work are not derived from the Program,
116and can be reasonably considered independent and separate works in
117themselves, then this License, and its terms, do not apply to those
118sections when you distribute them as separate works. But when you
119distribute the same sections as part of a whole which is a work based
120on the Program, the distribution of the whole must be on the terms of
121this License, whose permissions for other licensees extend to the
122entire whole, and thus to each and every part regardless of who wrote it.
123
124Thus, it is not the intent of this section to claim rights or contest
125your rights to work written entirely by you; rather, the intent is to
126exercise the right to control the distribution of derivative or
127collective works based on the Program.
128
129In addition, mere aggregation of another work not based on the Program
130with the Program (or with a work based on the Program) on a volume of
131a storage or distribution medium does not bring the other work under
132the scope of this License.
133
134 3. You may copy and distribute the Program (or a work based on it,
135under Section 2) in object code or executable form under the terms of
136Sections 1 and 2 above provided that you also do one of the following:
137
138 a) Accompany it with the complete corresponding machine-readable
139 source code, which must be distributed under the terms of Sections
140 1 and 2 above on a medium customarily used for software interchange; or,
141
142 b) Accompany it with a written offer, valid for at least three
143 years, to give any third party, for a charge no more than your
144 cost of physically performing source distribution, a complete
145 machine-readable copy of the corresponding source code, to be
146 distributed under the terms of Sections 1 and 2 above on a medium
147 customarily used for software interchange; or,
148
149 c) Accompany it with the information you received as to the offer
150 to distribute corresponding source code. (This alternative is
151 allowed only for noncommercial distribution and only if you
152 received the program in object code or executable form with such
153 an offer, in accord with Subsection b above.)
154
155The source code for a work means the preferred form of the work for
156making modifications to it. For an executable work, complete source
157code means all the source code for all modules it contains, plus any
158associated interface definition files, plus the scripts used to
159control compilation and installation of the executable. However, as a
160special exception, the source code distributed need not include
161anything that is normally distributed (in either source or binary
162form) with the major components (compiler, kernel, and so on) of the
163operating system on which the executable runs, unless that component
164itself accompanies the executable.
165
166If distribution of executable or object code is made by offering
167access to copy from a designated place, then offering equivalent
168access to copy the source code from the same place counts as
169distribution of the source code, even though third parties are not
170compelled to copy the source along with the object code.
171
172 4. You may not copy, modify, sublicense, or distribute the Program
173except as expressly provided under this License. Any attempt
174otherwise to copy, modify, sublicense or distribute the Program is
175void, and will automatically terminate your rights under this License.
176However, parties who have received copies, or rights, from you under
177this License will not have their licenses terminated so long as such
178parties remain in full compliance.
179
180 5. You are not required to accept this License, since you have not
181signed it. However, nothing else grants you permission to modify or
182distribute the Program or its derivative works. These actions are
183prohibited by law if you do not accept this License. Therefore, by
184modifying or distributing the Program (or any work based on the
185Program), you indicate your acceptance of this License to do so, and
186all its terms and conditions for copying, distributing or modifying
187the Program or works based on it.
188
189 6. Each time you redistribute the Program (or any work based on the
190Program), the recipient automatically receives a license from the
191original licensor to copy, distribute or modify the Program subject to
192these terms and conditions. You may not impose any further
193restrictions on the recipients' exercise of the rights granted herein.
194You are not responsible for enforcing compliance by third parties to
195this License.
196
197 7. If, as a consequence of a court judgment or allegation of patent
198infringement or for any other reason (not limited to patent issues),
199conditions are imposed on you (whether by court order, agreement or
200otherwise) that contradict the conditions of this License, they do not
201excuse you from the conditions of this License. If you cannot
202distribute so as to satisfy simultaneously your obligations under this
203License and any other pertinent obligations, then as a consequence you
204may not distribute the Program at all. For example, if a patent
205license would not permit royalty-free redistribution of the Program by
206all those who receive copies directly or indirectly through you, then
207the only way you could satisfy both it and this License would be to
208refrain entirely from distribution of the Program.
209
210If any portion of this section is held invalid or unenforceable under
211any particular circumstance, the balance of the section is intended to
212apply and the section as a whole is intended to apply in other
213circumstances.
214
215It is not the purpose of this section to induce you to infringe any
216patents or other property right claims or to contest validity of any
217such claims; this section has the sole purpose of protecting the
218integrity of the free software distribution system, which is
219implemented by public license practices. Many people have made
220generous contributions to the wide range of software distributed
221through that system in reliance on consistent application of that
222system; it is up to the author/donor to decide if he or she is willing
223to distribute software through any other system and a licensee cannot
224impose that choice.
225
226This section is intended to make thoroughly clear what is believed to
227be a consequence of the rest of this License.
228
229 8. If the distribution and/or use of the Program is restricted in
230certain countries either by patents or by copyrighted interfaces, the
231original copyright holder who places the Program under this License
232may add an explicit geographical distribution limitation excluding
233those countries, so that distribution is permitted only in or among
234countries not thus excluded. In such case, this License incorporates
235the limitation as if written in the body of this License.
236
237 9. The Free Software Foundation may publish revised and/or new versions
238of the General Public License from time to time. Such new versions will
239be similar in spirit to the present version, but may differ in detail to
240address new problems or concerns.
241
242Each version is given a distinguishing version number. If the Program
243specifies a version number of this License which applies to it and "any
244later version", you have the option of following the terms and conditions
245either of that version or of any later version published by the Free
246Software Foundation. If the Program does not specify a version number of
247this License, you may choose any version ever published by the Free Software
248Foundation.
249
250 10. If you wish to incorporate parts of the Program into other free
251programs whose distribution conditions are different, write to the author
252to ask for permission. For software which is copyrighted by the Free
253Software Foundation, write to the Free Software Foundation; we sometimes
254make exceptions for this. Our decision will be guided by the two goals
255of preserving the free status of all derivatives of our free software and
256of promoting the sharing and reuse of software generally.
257
258 NO WARRANTY
259
260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268REPAIR OR CORRECTION.
269
270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278POSSIBILITY OF SUCH DAMAGES.
279
280 END OF TERMS AND CONDITIONS
281
282 How to Apply These Terms to Your New Programs
283
284 If you develop a new program, and you want it to be of the greatest
285possible use to the public, the best way to achieve this is to make it
286free software which everyone can redistribute and change under these terms.
287
288 To do so, attach the following notices to the program. It is safest
289to attach them to the start of each source file to most effectively
290convey the exclusion of warranty; and each file should have at least
291the "copyright" line and a pointer to where the full notice is found.
292
293 <one line to give the program's name and a brief idea of what it does.>
294 Copyright (C) <year> <name of author>
295
296 This program is free software; you can redistribute it and/or modify
297 it under the terms of the GNU General Public License as published by
298 the Free Software Foundation; either version 2 of the License, or
299 (at your option) any later version.
300
301 This program is distributed in the hope that it will be useful,
302 but WITHOUT ANY WARRANTY; without even the implied warranty of
303 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304 GNU General Public License for more details.
305
306 You should have received a copy of the GNU General Public License along
307 with this program; if not, write to the Free Software Foundation, Inc.,
308 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
309
310Also add information on how to contact you by electronic and paper mail.
311
312If the program is interactive, make it output a short notice like this
313when it starts in an interactive mode:
314
315 Gnomovision version 69, Copyright (C) year name of author
316 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
317 This is free software, and you are welcome to redistribute it
318 under certain conditions; type `show c' for details.
319
320The hypothetical commands `show w' and `show c' should show the appropriate
321parts of the General Public License. Of course, the commands you use may
322be called something other than `show w' and `show c'; they could even be
323mouse-clicks or menu items--whatever suits your program.
324
325You should also get your employer (if you work as a programmer) or your
326school, if any, to sign a "copyright disclaimer" for the program, if
327necessary. Here is a sample; alter the names:
328
329 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
330 `Gnomovision' (which makes passes at compilers) written by James Hacker.
331
332 <signature of Ty Coon>, 1 April 1989
333 Ty Coon, President of Vice
334
335This General Public License does not permit incorporating your program into
336proprietary programs. If your program is a subroutine library, you may
337consider it more useful to permit linking proprietary applications with the
338library. If this is what you want to do, use the GNU Lesser General
339Public License instead of this License.
diff --git a/meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
deleted file mode 100644
index 8eeaab697c..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
+++ /dev/null
@@ -1,32 +0,0 @@
1# This file is part of systemd.
2#
3# systemd is free software; you can redistribute it and/or modify it
4# under the terms of the GNU General Public License as published by
5# the Free Software Foundation; either version 2 of the License, or
6# (at your option) any later version.
7
8[Unit]
9Description=Serial Getty on %I
10BindTo=dev-%i.device
11After=dev-%i.device systemd-user-sessions.service
12
13# If additional gettys are spawned during boot then we should make
14# sure that this is synchronized before getty.target, even though
15# getty.target didn't actually pull it in.
16Before=getty.target
17
18[Service]
19Environment=TERM=vt100
20ExecStart=-/sbin/agetty -s %I @BAUDRATE@
21Restart=always
22RestartSec=0
23UtmpIdentifier=%I
24TTYPath=/dev/%I
25TTYReset=yes
26TTYVHangup=yes
27KillMode=process
28IgnoreSIGPIPE=no
29
30# Some login implementations ignore SIGTERM, so we send SIGHUP
31# instead, to ensure that login terminates cleanly.
32KillSignal=SIGHUP
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
deleted file mode 100644
index c9c3317ff4..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1DESCRIPTION = "Wrapper to enable of systemd services"
2
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5
6PR = "r7"
7
8inherit native
9
10# BPN is not enough in this case
11FILESPATH = "${FILE_DIRNAME}/${PN}/"
12
13SRC_URI = "file://systemctl"
14
15do_install() {
16 install -d ${D}${bindir}
17 install -m 0755 ${WORKDIR}/systemctl ${D}${bindir}
18}
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
deleted file mode 100755
index d71c7eda8b..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
+++ /dev/null
@@ -1,126 +0,0 @@
1#!/bin/sh
2echo "Started $0 $*"
3
4ROOT=
5
6# parse command line params
7action=
8while [ $# != 0 ]; do
9 opt="$1"
10
11 case "$opt" in
12 enable)
13 shift
14
15 action="$opt"
16 services="$1"
17 cmd_args="1"
18 shift
19 ;;
20 disable)
21 shift
22
23 action="$opt"
24 services="$1"
25 cmd_args="1"
26 shift
27 ;;
28 mask)
29 shift
30
31 action="$opt"
32 services="$1"
33 cmd_args="1"
34 shift
35 ;;
36 --root=*)
37 ROOT=${opt##--root=}
38 cmd_args="0"
39 shift
40 ;;
41 *)
42 if [ "$cmd_args" = "1" ]; then
43 services="$services $opt"
44 shift
45 else
46 echo "'$opt' is an unkown option; exiting with error"
47 exit 1
48 fi
49 ;;
50 esac
51done
52
53for service in $services; do
54 if [ "$action" = "mask" ]; then
55 if [ ! -d $ROOT/etc/systemd/system/ ]; then
56 mkdir -p $ROOT/etc/systemd/system/
57 fi
58 cmd="ln -s /dev/null $ROOT/etc/systemd/system/$service"
59 echo "$cmd"
60 $cmd
61 exit 0
62 fi
63
64 echo "Try to find location of $service..."
65 # find service file
66 for p in $ROOT/etc/systemd/system \
67 $ROOT/lib/systemd/system \
68 $ROOT/usr/lib/systemd/system; do
69 if [ -e $p/$service ]; then
70 service_file=$p/$service
71 service_file=${service_file##$ROOT}
72 fi
73 done
74 if [ -z "$service_file" ]; then
75 echo "'$service' couldn't be found; exiting with error"
76 exit 1
77 fi
78 echo "Found $service in $service_file"
79
80 # create the required symbolic links
81 wanted_by=$(grep WantedBy $ROOT/$service_file \
82 | sed 's,WantedBy=,,g' \
83 | tr ',' '\n' \
84 | grep '\(\.target$\)\|\(\.service$\)')
85
86 for r in $wanted_by; do
87 echo "WantedBy=$r found in $service"
88 if [ "$action" = "enable" ]; then
89 mkdir -p $ROOT/etc/systemd/system/$r.wants
90 ln -s $service_file $ROOT/etc/systemd/system/$r.wants
91 echo "Enabled $service for $wanted_by."
92 else
93 rm -f $ROOT/etc/systemd/system/$r.wants/$service
94 rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants
95 echo "Disabled $service for $wanted_by."
96 fi
97 done
98
99 # create the required symbolic 'Alias' links
100 alias=$(grep Alias $ROOT/$service_file \
101 | sed 's,Alias=,,g' \
102 | tr ',' '\n' \
103 | grep '\.service$')
104
105 for r in $alias; do
106 if [ "$action" = "enable" ]; then
107 mkdir -p $ROOT/etc/systemd/system
108 ln -s $service_file $ROOT/etc/systemd/system/$r
109 echo "Enabled $service for $alias."
110 else
111 rm -f $ROOT/etc/systemd/system/$r
112 echo "Disabled $service for $alias."
113 fi
114 done
115
116 # call us for the other required scripts
117 also=$(grep Also $ROOT/$service_file \
118 | sed 's,Also=,,g' \
119 | tr ',' '\n')
120 for a in $also; do
121 echo "Also=$a found in $service"
122 if [ "$action" = "enable" ]; then
123 $0 --root=$ROOT enable $a
124 fi
125 done
126done
diff --git a/meta-systemd/recipes-core/systemd/systemd/0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch b/meta-systemd/recipes-core/systemd/systemd/0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch
deleted file mode 100644
index 7de2705ace..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch
+++ /dev/null
@@ -1,103 +0,0 @@
1From 2003e63f48cee2f497de7b90b66284f98c1c9919 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 10 Dec 2012 12:24:32 +0100
4Subject: [PATCH 1/2] Revert "systemd-analyze: use argparse instead of getopt"
5
6This reverts commit 0c0271841ab45595f71528c50bcf1904d4b841d5.
7
8Argparse is broken in current OE python
9---
10 src/analyze/systemd-analyze | 60 ++++++++++++++++++++++++++++---------------
11 1 files changed, 39 insertions(+), 21 deletions(-)
12
13diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze
14index 88699d6..87a83dd 100755
15--- a/src/analyze/systemd-analyze
16+++ b/src/analyze/systemd-analyze
17@@ -1,7 +1,6 @@
18 #!/usr/bin/python
19
20-import sys, os
21-import argparse
22+import getopt, sys, os
23 from gi.repository import Gio
24 try:
25 import cairo
26@@ -76,6 +75,20 @@ def draw_text(context, x, y, text, size = 12, r = 0, g = 0, b = 0, vcenter = 0.5
27
28 context.restore()
29
30+def usage():
31+ sys.stdout.write("""systemd-analyze [--user] time
32+systemd-analyze [--user] blame
33+systemd-analyze [--user] plot
34+
35+Process systemd profiling information
36+
37+ -h --help Show this help
38+""")
39+
40+def help():
41+ usage()
42+ sys.exit()
43+
44 def time():
45
46 initrd_time, start_time, finish_time = acquire_start_time()
47@@ -266,29 +279,34 @@ def plot():
48
49 surface.finish()
50
51-parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,
52- description='Process systemd profiling information',
53- epilog='''\
54-time - print time spent in the kernel before reaching userspace
55-blame - print list of running units ordered by time to init
56-plot - output SVG graphic showing service initialization
57-''')
58-
59-parser.add_argument('action', choices=('time', 'blame', 'plot'),
60- default='time', nargs='?',
61- help='action to perform (default: time)')
62-parser.add_argument('--user', action='store_true',
63- help='use the session bus')
64+def unknown_verb():
65+ sys.stderr.write("Unknown verb '%s'.\n" % args[0])
66+ usage()
67+ sys.exit(1)
68
69-args = parser.parse_args()
70+bus = Gio.BusType.SYSTEM
71
72-if args.user:
73- bus = Gio.BusType.SESSION
74-else:
75- bus = Gio.BusType.SYSTEM
76+try:
77+ opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"])
78+except getopt.GetoptError as err:
79+ sys.stdout.write(str(err) + "\n")
80+ usage()
81+ sys.exit(2)
82+for o, a in opts:
83+ if o in ("-h", "--help"):
84+ help()
85+ elif o == '--user':
86+ bus = Gio.BusType.SESSION
87+ else:
88+ assert False, "unhandled option"
89
90 verb = {'time' : time,
91 'blame': blame,
92 'plot' : plot,
93+ 'help' : help,
94 }
95-verb.get(args.action)()
96+
97+if len(args) == 0:
98+ time()
99+else:
100+ verb.get(args[0], unknown_verb)()
101--
1021.7.7.6
103
diff --git a/meta-systemd/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch b/meta-systemd/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch
deleted file mode 100644
index e5e8d7df0d..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1From 8079db861b8ffdce69fa10a9ab9ef4740045187f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 10 Dec 2012 12:25:00 +0100
4Subject: [PATCH 2/2] Revert "analyze: use GDBus instead of dbus-python"
5
6This reverts commit 4940c64240541e91411620b7dc0963e012aa6b91.
7
8Python-gobject is too old in current OE
9---
10 src/analyze/systemd-analyze | 31 ++++++++++++++-----------------
11 1 files changed, 14 insertions(+), 17 deletions(-)
12
13diff --git a/src/analyze/systemd-analyze b/src/analyze/systemd-analyze
14index 87a83dd..636fd74 100755
15--- a/src/analyze/systemd-analyze
16+++ b/src/analyze/systemd-analyze
17@@ -1,15 +1,14 @@
18 #!/usr/bin/python
19
20-import getopt, sys, os
21-from gi.repository import Gio
22+import getopt, dbus, sys, os
23 try:
24 import cairo
25 except ImportError:
26 cairo = None
27
28 def acquire_time_data():
29- manager = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE,
30- None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.systemd1.Manager', None)
31+
32+ manager = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.systemd1.Manager')
33 units = manager.ListUnits()
34
35 l = []
36@@ -18,25 +17,23 @@ def acquire_time_data():
37 if i[5] != "":
38 continue
39
40- properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE,
41- None, 'org.freedesktop.systemd1', i[6], 'org.freedesktop.DBus.Properties', None)
42+ properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', i[6]), 'org.freedesktop.DBus.Properties')
43
44- ixt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic')
45- aet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic')
46- axt = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic')
47- iet = properties.Get('(ss)', 'org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic')
48+ ixt = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveExitTimestampMonotonic'))
49+ aet = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveEnterTimestampMonotonic'))
50+ axt = int(properties.Get('org.freedesktop.systemd1.Unit', 'ActiveExitTimestampMonotonic'))
51+ iet = int(properties.Get('org.freedesktop.systemd1.Unit', 'InactiveEnterTimestampMonotonic'))
52
53 l.append((str(i[0]), ixt, aet, axt, iet))
54
55 return l
56
57 def acquire_start_time():
58- properties = Gio.DBusProxy.new_for_bus_sync(bus, Gio.DBusProxyFlags.NONE,
59- None, 'org.freedesktop.systemd1', '/org/freedesktop/systemd1', 'org.freedesktop.DBus.Properties', None)
60+ properties = dbus.Interface(bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1'), 'org.freedesktop.DBus.Properties')
61
62- initrd_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic')
63- userspace_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic')
64- finish_time = properties.Get('(ss)', 'org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic')
65+ initrd_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'InitRDTimestampMonotonic'))
66+ userspace_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'UserspaceTimestampMonotonic'))
67+ finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic'))
68
69 if finish_time == 0:
70 sys.stderr.write("Bootup is not yet finished. Please try again later.\n")
71@@ -284,7 +281,7 @@ def unknown_verb():
72 usage()
73 sys.exit(1)
74
75-bus = Gio.BusType.SYSTEM
76+bus = dbus.SystemBus()
77
78 try:
79 opts, args = getopt.gnu_getopt(sys.argv[1:], "h", ["help", "user"])
80@@ -296,7 +293,7 @@ for o, a in opts:
81 if o in ("-h", "--help"):
82 help()
83 elif o == '--user':
84- bus = Gio.BusType.SESSION
85+ bus = dbus.SessionBus()
86 else:
87 assert False, "unhandled option"
88
89--
901.7.7.6
91
diff --git a/meta-systemd/recipes-core/systemd/systemd/gtk-doc.make b/meta-systemd/recipes-core/systemd/systemd/gtk-doc.make
deleted file mode 100644
index 57fab98686..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/gtk-doc.make
+++ /dev/null
@@ -1,230 +0,0 @@
1# -*- mode: makefile -*-
2
3####################################
4# Everything below here is generic #
5####################################
6
7if GTK_DOC_USE_LIBTOOL
8GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
10GTKDOC_RUN = $(LIBTOOL) --mode=execute
11else
12GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
14GTKDOC_RUN =
15endif
16
17# We set GPATH here; this gives us semantics for GNU make
18# which are more like other make's VPATH, when it comes to
19# whether a source that is a target of one rule is then
20# searched for in VPATH/GPATH.
21#
22GPATH = $(srcdir)
23
24TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
25
26EXTRA_DIST = \
27 $(content_files) \
28 $(HTML_IMAGES) \
29 $(DOC_MAIN_SGML_FILE) \
30 $(DOC_MODULE)-sections.txt \
31 $(DOC_MODULE)-overrides.txt
32
33DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
34 pdf-build.stamp \
35 $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
36 $(srcdir)/pdf.stamp
37
38SCANOBJ_FILES = \
39 $(DOC_MODULE).args \
40 $(DOC_MODULE).hierarchy \
41 $(DOC_MODULE).interfaces \
42 $(DOC_MODULE).prerequisites \
43 $(DOC_MODULE).signals
44
45REPORT_FILES = \
46 $(DOC_MODULE)-undocumented.txt \
47 $(DOC_MODULE)-undeclared.txt \
48 $(DOC_MODULE)-unused.txt
49
50CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
51
52if ENABLE_GTK_DOC
53if GTK_DOC_BUILD_HTML
54HTML_BUILD_STAMP=html-build.stamp
55else
56HTML_BUILD_STAMP=
57endif
58if GTK_DOC_BUILD_PDF
59PDF_BUILD_STAMP=pdf-build.stamp
60else
61PDF_BUILD_STAMP=
62endif
63
64all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
65else
66all-local:
67endif
68
69docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
70
71$(REPORT_FILES): sgml-build.stamp
72
73#### scan ####
74
75scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
76 @echo 'gtk-doc: Scanning header files'
77 @-chmod -R u+w $(srcdir)
78 @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
79 _source_dir="$${_source_dir} --source-dir=$$i" ; \
80 done ; \
81 cd $(srcdir) && \
82 gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
83 @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
84 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
85 else \
86 cd $(srcdir) ; \
87 for i in $(SCANOBJ_FILES) ; do \
88 test -f $$i || touch $$i ; \
89 done \
90 fi
91 @touch scan-build.stamp
92
93$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
94 @true
95
96#### templates ####
97
98tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
99 @echo 'gtk-doc: Rebuilding template files'
100 @-chmod -R u+w $(srcdir)
101 @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
102 @touch tmpl-build.stamp
103
104tmpl.stamp: tmpl-build.stamp
105 @true
106
107$(srcdir)/tmpl/*.sgml:
108 @true
109
110#### xml ####
111
112sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
113 @echo 'gtk-doc: Building XML'
114 @-chmod -R u+w $(srcdir)
115 @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
116 _source_dir="$${_source_dir} --source-dir=$$i" ; \
117 done ; \
118 cd $(srcdir) && \
119 gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
120 @touch sgml-build.stamp
121
122sgml.stamp: sgml-build.stamp
123 @true
124
125#### html ####
126
127html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
128 @echo 'gtk-doc: Building HTML'
129 @-chmod -R u+w $(srcdir)
130 @rm -rf $(srcdir)/html
131 @mkdir $(srcdir)/html
132 @mkhtml_options=""; \
133 gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
134 if test "$(?)" = "0"; then \
135 mkhtml_options=--path="$(srcdir)"; \
136 fi; \
137 cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
138 @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
139 @echo 'gtk-doc: Fixing cross-references'
140 @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
141 @touch html-build.stamp
142
143#### pdf ####
144
145pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
146 @echo 'gtk-doc: Building PDF'
147 @-chmod -R u+w $(srcdir)
148 @rm -rf $(srcdir)/$(DOC_MODULE).pdf
149 @mkpdf_imgdirs=""; \
150 if test "x$(HTML_IMAGES)" != "x"; then \
151 for img in $(HTML_IMAGES); do \
152 part=`dirname $$img`; \
153 echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
154 if test $$? != 0; then \
155 mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
156 fi; \
157 done; \
158 fi; \
159 cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
160 @touch pdf-build.stamp
161
162##############
163
164clean-local:
165 rm -f *~ *.bak
166 rm -rf .libs
167
168distclean-local:
169 cd $(srcdir) && \
170 rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
171 $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
172
173maintainer-clean-local: clean
174 cd $(srcdir) && rm -rf xml html
175
176install-data-local:
177 @installfiles=`echo $(srcdir)/html/*`; \
178 if test "$$installfiles" = '$(srcdir)/html/*'; \
179 then echo '-- Nothing to install' ; \
180 else \
181 if test -n "$(DOC_MODULE_VERSION)"; then \
182 installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
183 else \
184 installdir="$(DESTDIR)$(TARGET_DIR)"; \
185 fi; \
186 $(mkinstalldirs) $${installdir} ; \
187 for i in $$installfiles; do \
188 echo '-- Installing '$$i ; \
189 $(INSTALL_DATA) $$i $${installdir}; \
190 done; \
191 if test -n "$(DOC_MODULE_VERSION)"; then \
192 mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
193 $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
194 mv -f $${installdir}/$(DOC_MODULE).devhelp \
195 $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
196 fi; \
197 $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
198 fi
199
200uninstall-local:
201 @if test -n "$(DOC_MODULE_VERSION)"; then \
202 installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
203 else \
204 installdir="$(DESTDIR)$(TARGET_DIR)"; \
205 fi; \
206 rm -rf $${installdir}
207
208#
209# Require gtk-doc when making dist
210#
211if ENABLE_GTK_DOC
212dist-check-gtkdoc:
213else
214dist-check-gtkdoc:
215 @echo "*** gtk-doc must be installed and enabled in order to make dist"
216 @false
217endif
218
219dist-hook: dist-check-gtkdoc dist-hook-local
220 mkdir $(distdir)/tmpl
221 mkdir $(distdir)/html
222 -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
223 cp $(srcdir)/html/* $(distdir)/html
224 -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
225 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
226 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
227 cd $(distdir) && rm -f $(DISTCLEANFILES)
228 $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
229
230.PHONY : dist-hook-local docs
diff --git a/meta-systemd/recipes-core/systemd/systemd/modprobe.rules b/meta-systemd/recipes-core/systemd/systemd/modprobe.rules
deleted file mode 100644
index d4a096b82b..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/modprobe.rules
+++ /dev/null
@@ -1,17 +0,0 @@
1# There are a number of modifiers that are allowed to be used in some
2# of the different fields. They provide the following subsitutions:
3#
4# %n the "kernel number" of the device.
5# For example, 'sda3' has a "kernel number" of '3'
6# %e the smallest number for that name which does not matches an existing node
7# %k the kernel name for the device
8# %M the kernel major number for the device
9# %m the kernel minor number for the device
10# %b the bus id for the device
11# %c the string returned by the PROGRAM
12# %s{filename} the content of a sysfs attribute
13# %% the '%' char itself
14#
15
16# Try and modprobe for drivers for new hardware
17ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta-systemd/recipes-core/systemd/systemd/optional_secure_getenv.patch b/meta-systemd/recipes-core/systemd/systemd/optional_secure_getenv.patch
deleted file mode 100644
index 35f1467c54..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/optional_secure_getenv.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1on uclibc secure_getenv is not available
2therefore default to using getenv instead
3
4Singed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Upstream-Status: Pending
7Index: git/src/shared/missing.h
8===================================================================
9--- git.orig/src/shared/missing.h 2012-09-22 18:46:44.141282145 -0700
10+++ git/src/shared/missing.h 2012-09-22 18:48:44.081276570 -0700
11@@ -233,6 +233,8 @@
12 #ifndef HAVE_SECURE_GETENV
13 # ifdef HAVE___SECURE_GETENV
14 # define secure_getenv __secure_getenv
15+# elif defined __UCLIBC__
16+# define secure_getenv getenv
17 # else
18 # error neither secure_getenv nor __secure_getenv are available
19 # endif
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
deleted file mode 100644
index 1bfc3bdb18..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1--- systemd-185.orig/configure.ac 2012-06-04 14:15:16.000000000 -0400
2+++ systemd-pam-185/configure.ac 2012-06-21 22:57:10.000000000 -0400
3@@ -63,6 +63,23 @@
4
5 AC_PATH_PROG([M4], [m4])
6
7+# check for few functions not implemented in uClibc
8+
9+AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
10+
11+# check for %ms format support - assume always no if cross compiling
12+
13+AC_MSG_CHECKING([whether %ms format is supported by *scanf])
14+
15+AC_RUN_IFELSE(
16+ [AC_LANG_PROGRAM([[ include <stdio.h> ]],
17+ [[ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
18+ int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ;
19+ return (rc==3)?0:1;]])],
20+ [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])],
21+ [AC_MSG_RESULT([no])],
22+ [AC_MSG_RESULT([no])])
23+
24 # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
25 m4_ifdef([GTK_DOC_CHECK], [
26 GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
deleted file mode 100644
index 449c27f88c..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Index: git/src/nspawn/nspawn.c
2===================================================================
3--- git.orig/src/nspawn/nspawn.c 2012-09-22 17:57:05.000000000 -0700
4+++ git/src/nspawn/nspawn.c 2012-09-22 18:01:41.541405768 -0700
5@@ -63,6 +63,8 @@
6 LINK_GUEST
7 } LinkJournal;
8
9+#include "config.h"
10+
11 static char *arg_directory = NULL;
12 static char *arg_user = NULL;
13 static char **arg_controllers = NULL;
14@@ -1373,7 +1375,12 @@
15 a[0] = (char*) "/sbin/init";
16 execve(a[0], a, (char**) envp);
17 } else if (argc > optind)
18+#ifdef HAVE_EXECVPE
19 execvpe(argv[optind], argv + optind, (char**) envp);
20+#else
21+ environ = (char **)envp;
22+ execvp(argv[optind], argv + optind);
23+#endif /* HAVE_EXECVPE */
24 else {
25 chdir(home ? home : "/root");
26 execle("/bin/bash", "-bash", NULL, (char**) envp);
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
deleted file mode 100644
index 089ba64690..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1Index: git/src/journal/journal-file.c
2===================================================================
3--- git.orig/src/journal/journal-file.c 2012-09-02 09:49:15.126089594 -0700
4+++ git/src/journal/journal-file.c 2012-09-02 09:49:17.118089670 -0700
5@@ -34,6 +34,8 @@
6 #include "compress.h"
7 #include "fsprg.h"
8
9+#include "config.h"
10+
11 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
12 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
13
14@@ -262,7 +264,7 @@
15
16 static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
17 uint64_t old_size, new_size;
18- int r;
19+ int r = 0;
20
21 assert(f);
22
23@@ -307,10 +309,25 @@
24 /* Note that the glibc fallocate() fallback is very
25 inefficient, hence we try to minimize the allocation area
26 as we can. */
27+#ifdef HAVE_POSIX_ALLOCATE
28 r = posix_fallocate(f->fd, old_size, new_size - old_size);
29 if (r != 0)
30 return -r;
31
32+#else
33+ /* Use good old method to write zeros into the journal file
34+ perhaps very inefficient yet working. */
35+ if(new_size > old_size) {
36+ char *buf = alloca(new_size - old_size);
37+ off_t oldpos = lseek(f->fd, 0, SEEK_CUR);
38+ bzero(buf, new_size - old_size);
39+ lseek(f->fd, old_size, SEEK_SET);
40+ r = write(f->fd, buf, new_size - old_size);
41+ lseek(f->fd, oldpos, SEEK_SET);
42+ }
43+ if (r < 0)
44+ return -errno;
45+#endif /* HAVE_POSIX_FALLOCATE */
46 if (fstat(f->fd, &f->last_stat) < 0)
47 return -errno;
48
49Index: git/src/journal/journald-kmsg.c
50===================================================================
51--- git.orig/src/journal/journald-kmsg.c 2012-09-02 09:49:15.130089595 -0700
52+++ git/src/journal/journald-kmsg.c 2012-09-02 12:26:17.326447895 -0700
53@@ -404,6 +404,7 @@
54
55 int server_open_kernel_seqnum(Server *s) {
56 int fd;
57+ int r = 0;
58 uint64_t *p;
59
60 assert(s);
61@@ -417,8 +418,19 @@
62 log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");
63 return 0;
64 }
65-
66- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) {
67+#ifdef HAVE_POSIX_ALLOCATE
68+ r = posix_fallocate(fd, 0, sizeof(uint64_t));
69+#else
70+ /* Use good old method to write zeros into the journal file
71+ perhaps very inefficient yet working. */
72+ char *buf = alloca(sizeof(uint64_t));
73+ off_t oldpos = lseek(fd, 0, SEEK_CUR);
74+ bzero(buf, sizeof(uint64_t));
75+ lseek(fd, 0, SEEK_SET);
76+ r = write(fd, buf, sizeof(uint64_t));
77+ lseek(fd, oldpos, SEEK_SET);
78+#endif /* HAVE_POSIX_FALLOCATE */
79+ if (r < 0) {
80 log_error("Failed to allocate sequential number file, ignoring: %m");
81 close_nointr_nofail(fd);
82 return 0;
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
deleted file mode 100644
index 3e5ea71e04..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Prefer getty to agetty in console setup systemd units
2
3Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
4---
5 units/getty@.service.m4 | 2 +-
6 units/serial-getty@.service.m4 | 2 +-
7 2 files changed, 2 insertions(+), 2 deletions(-)
8
9Index: systemd-37/units/getty@.service.m4
10===================================================================
11--- systemd-37.orig/units/getty@.service.m4
12+++ systemd-37/units/getty@.service.m4
13@@ -41,7 +41,7 @@
14
15 [Service]
16 Environment=TERM=linux
17 # the VT is cleared by TTYVTDisallocate
18-ExecStart=-/sbin/agetty --noclear %I 38400
19+ExecStart=-/sbin/getty -L %I 115200 linux
20 Type=idle
21 Restart=always
22 RestartSec=0
23Index: systemd-37/units/serial-getty@.service.m4
24===================================================================
25--- systemd-37.orig/units/serial-getty@.service.m4
26+++ systemd-37/units/serial-getty@.service.m4
27@@ -37,7 +37,7 @@
28
29 [Service]
30 Environment=TERM=vt102
31-ExecStart=-/sbin/agetty -s %I 115200,38400,9600
32+ExecStart=-/sbin/getty -L %I 115200 vt100
33 Type=idle
34 Restart=always
35 RestartSec=0
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
deleted file mode 100644
index 8de9a3a326..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
+++ /dev/null
@@ -1,166 +0,0 @@
1Index: git/src/journal/journal-send.c
2===================================================================
3--- git.orig/src/journal/journal-send.c 2012-09-02 00:10:08.748768268 -0700
4+++ git/src/journal/journal-send.c 2012-09-02 00:10:10.508768335 -0700
5@@ -34,6 +34,8 @@
6
7 #define SNDBUF_SIZE (8*1024*1024)
8
9+#include "config.h"
10+
11 /* We open a single fd, and we'll share it with the current process,
12 * all its threads, and all its subprocesses. This means we need to
13 * initialize it atomically, and need to operate on it atomically
14@@ -293,7 +295,12 @@
15 * file and just pass a file descriptor of it to the other
16 * side */
17
18+#ifdef HAVE_MKOSTEMP
19 buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR);
20+#else
21+ buffer_fd = mkstemp(path);
22+ if (buffer_fd >= 0) fcntl(buffer_fd, F_SETFD, FD_CLOEXEC);
23+#endif /* HAVE_MKOSTEMP */
24 if (buffer_fd < 0) {
25 r = -errno;
26 goto finish;
27Index: git/src/core/manager.c
28===================================================================
29--- git.orig/src/core/manager.c 2012-09-02 00:10:08.732768266 -0700
30+++ git/src/core/manager.c 2012-09-02 00:10:10.512768334 -0700
31@@ -67,6 +67,8 @@
32 #include "cgroup-util.h"
33 #include "path-util.h"
34
35+#include "config.h"
36+
37 /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
38 #define GC_QUEUE_ENTRIES_MAX 16
39
40@@ -1701,7 +1703,12 @@
41 return -ENOMEM;
42
43 saved_umask = umask(0077);
44+#ifdef HAVE_MKOSTEMP
45 fd = mkostemp(path, O_RDWR|O_CLOEXEC);
46+#else
47+ fd = mkstemp(path);
48+ if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
49+#endif /* HAVE_MKOSTEMP */
50 umask(saved_umask);
51
52 if (fd < 0) {
53Index: git/src/shared/util.c
54===================================================================
55--- git.orig/src/shared/util.c 2012-09-02 00:10:08.784768269 -0700
56+++ git/src/shared/util.c 2012-09-02 00:10:10.512768334 -0700
57@@ -68,6 +68,8 @@
58 #include "exit-status.h"
59 #include "hashmap.h"
60
61+#include "config.h"
62+
63 int saved_argc = 0;
64 char **saved_argv = NULL;
65
66@@ -4519,7 +4521,12 @@
67 t[k] = '.';
68 stpcpy(stpcpy(t+k+1, fn), "XXXXXX");
69
70+#ifdef HAVE_MKOSTEMP
71 fd = mkostemp(t, O_WRONLY|O_CLOEXEC);
72+#else
73+ fd = mkstemp(t);
74+ if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
75+#endif /* HAVE_MKOSTEMP */
76 if (fd < 0) {
77 free(t);
78 return -errno;
79Index: git/src/shared/ask-password-api.c
80===================================================================
81--- git.orig/src/shared/ask-password-api.c 2012-09-02 00:10:08.772768268 -0700
82+++ git/src/shared/ask-password-api.c 2012-09-02 00:10:10.512768334 -0700
83@@ -37,6 +37,8 @@
84
85 #include "ask-password-api.h"
86
87+#include "config.h"
88+
89 static void backspace_chars(int ttyfd, size_t p) {
90
91 if (ttyfd < 0)
92@@ -326,7 +328,12 @@
93 mkdir_p_label("/run/systemd/ask-password", 0755);
94
95 u = umask(0022);
96+#ifdef HAVE_MKOSTEMP
97 fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
98+#else
99+ fd = mkstemp(temp);
100+ if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
101+#endif /* HAVE_MKOSTEMP */
102 umask(u);
103
104 if (fd < 0) {
105Index: git/src/journal/journalctl.c
106===================================================================
107--- git.orig/src/journal/journalctl.c 2012-09-02 00:10:08.752768267 -0700
108+++ git/src/journal/journalctl.c 2012-09-02 00:18:41.928787779 -0700
109@@ -540,7 +540,13 @@
110 n /= arg_interval;
111
112 close_nointr_nofail(fd);
113+#ifdef HAVE_MKOSTEMP
114 fd = mkostemp(k, O_WRONLY|O_CLOEXEC|O_NOCTTY);
115+#else
116+ fd = mkstemp(k);
117+ if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
118+#endif /* HAVE_MKOSTEMP */
119+
120 if (fd < 0) {
121 log_error("Failed to open %s: %m", k);
122 r = -errno;
123Index: git/src/journal/journal-verify.c
124===================================================================
125--- git.orig/src/journal/journal-verify.c 2012-09-02 00:10:08.752768267 -0700
126+++ git/src/journal/journal-verify.c 2012-09-02 00:24:10.268800268 -0700
127@@ -693,8 +693,12 @@
128 #endif
129 } else if (f->seal)
130 return -ENOKEY;
131-
132+#ifdef HAVE_MKOSTEMP
133 data_fd = mkostemp(data_path, O_CLOEXEC);
134+#else
135+ data_fd = mkstemp(data_path);
136+ if (data_fd >= 0) fcntl(data_fd, F_SETFD, FD_CLOEXEC);
137+#endif /* HAVE_MKOSTEMP */
138 if (data_fd < 0) {
139 log_error("Failed to create data file: %m");
140 r = -errno;
141@@ -702,7 +706,12 @@
142 }
143 unlink(data_path);
144
145+#ifdef HAVE_MKOSTEMP
146 entry_fd = mkostemp(entry_path, O_CLOEXEC);
147+#else
148+ entry_fd = mkstemp(entry_path);
149+ if (entry_fd >= 0) fcntl(entry_fd, F_SETFD, FD_CLOEXEC);
150+#endif /* HAVE_MKOSTEMP */
151 if (entry_fd < 0) {
152 log_error("Failed to create entry file: %m");
153 r = -errno;
154@@ -710,7 +719,12 @@
155 }
156 unlink(entry_path);
157
158+#ifdef HAVE_MKOSTEMP
159 entry_array_fd = mkostemp(entry_array_path, O_CLOEXEC);
160+#else
161+ entry_array_fd = mkstemp(entry_array_path);
162+ if (entry_array_fd >= 0) fcntl(entry_array_fd, F_SETFD, FD_CLOEXEC);
163+#endif /* HAVE_MKOSTEMP */
164 if (entry_array_fd < 0) {
165 log_error("Failed to create entry array file: %m");
166 r = -errno;
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
deleted file mode 100644
index ee63329830..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
+++ /dev/null
@@ -1,335 +0,0 @@
1--- systemd-pam-185/src/fsck/fsck.c.orig 2012-06-22 23:22:22.000000000 -0400
2+++ systemd-pam-185/src/fsck/fsck.c 2012-06-22 21:15:56.000000000 -0400
3@@ -36,6 +36,8 @@
4 #include "bus-errors.h"
5 #include "virt.h"
6
7+#include "config.h"
8+
9 static bool arg_skip = false;
10 static bool arg_force = false;
11 static bool arg_show_progress = false;
12@@ -193,9 +195,16 @@
13 char *device;
14 double p;
15 usec_t t;
16-
17+#ifdef HAVE_MSFORMAT
18 if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4)
19- break;
20+#else
21+ device = malloc(257);
22+ if (fscanf(f, "%i %lu %lu %256s", &pass, &cur, &max, device) != 4) {
23+ free(device);
24+ }
25+
26+#endif /* HAVE_MSFORMAT */
27+ break;
28
29 /* Only show one progress counter at max */
30 if (!locked) {
31--- systemd-pam-185/src/core/swap.c.orig 2012-06-22 23:22:55.000000000 -0400
32+++ systemd-pam-185/src/core/swap.c 2012-06-22 21:17:10.000000000 -0400
33@@ -40,6 +40,8 @@
34 #include "def.h"
35 #include "path-util.h"
36
37+#include "config.h"
38+
39 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
40 [SWAP_DEAD] = UNIT_INACTIVE,
41 [SWAP_ACTIVATING] = UNIT_ACTIVATING,
42@@ -1038,7 +1040,7 @@
43 for (i = 1;; i++) {
44 char *dev = NULL, *d;
45 int prio = 0, k;
46-
47+#ifdef HAVE_MSFORMAT
48 if ((k = fscanf(m->proc_swaps,
49 "%ms " /* device/file */
50 "%*s " /* type of swap */
51@@ -1046,10 +1048,18 @@
52 "%*s " /* used */
53 "%i\n", /* priority */
54 &dev, &prio)) != 2) {
55-
56+#else
57+ dev = malloc(257);
58+ if ((k = fscanf(m->proc_swaps,
59+ "%256s " /* device/file */
60+ "%*s " /* type of swap */
61+ "%*s " /* swap size */
62+ "%*s " /* used */
63+ "%i\n", /* priority */
64+ dev, &prio)) != 2) {
65+#endif /* HAVE_MSFORMAT */
66 if (k == EOF)
67 break;
68-
69 log_warning("Failed to parse /proc/swaps:%u.", i);
70 free(dev);
71 continue;
72--- systemd-pam-185/src/core/mount-setup.c.orig 2012-06-22 23:23:41.000000000 -0400
73+++ systemd-pam-185/src/core/mount-setup.c 2012-06-22 21:19:44.000000000 -0400
74@@ -28,6 +28,7 @@
75 #include <assert.h>
76 #include <unistd.h>
77 #include <ftw.h>
78+#include <linux/fs.h>
79
80 #include "mount-setup.h"
81 #include "dev-setup.h"
82@@ -41,6 +41,8 @@
83 #include "path-util.h"
84 #include "missing.h"
85
86+#include "config.h"
87+
88 #ifndef TTY_GID
89 #define TTY_GID 5
90 #endif
91@@ -200,9 +202,12 @@
92 for (;;) {
93 char *controller;
94 int enabled = 0;
95-
96+#ifdef HAVE_MSFORMAT
97 if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) {
98-
99+#else
100+ controller = malloc(257);
101+ if (fscanf(f, "%256s %*i %*i %i", controller, &enabled) != 2) {
102+#endif /* HAVE_MSFORMAT */
103 if (feof(f))
104 break;
105
106--- systemd-pam-185/src/core/mount.c.orig 2012-06-22 23:24:17.000000000 -0400
107+++ systemd-pam-185/src/core/mount.c 2012-06-22 22:51:21.000000000 -0400
108@@ -41,6 +41,8 @@
109 #include "exit-status.h"
110 #include "def.h"
111
112+#include "config.h"
113+
114 static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
115 [MOUNT_DEAD] = UNIT_INACTIVE,
116 [MOUNT_MOUNTING] = UNIT_ACTIVATING,
117@@ -1514,7 +1516,7 @@
118 int k;
119
120 device = path = options = options2 = fstype = d = p = o = NULL;
121-
122+#ifdef HAVE_MSFORMAT
123 if ((k = fscanf(m->proc_self_mountinfo,
124 "%*s " /* (1) mount id */
125 "%*s " /* (2) parent id */
126@@ -1533,7 +1535,31 @@
127 &fstype,
128 &device,
129 &options2)) != 5) {
130-
131+#else
132+ path = malloc(257);
133+ options = malloc(257);
134+ fstype = malloc(257);
135+ device = malloc(257);
136+ options2 = malloc(257);
137+ if ((k = fscanf(m->proc_self_mountinfo,
138+ "%*s " /* (1) mount id */
139+ "%*s " /* (2) parent id */
140+ "%*s " /* (3) major:minor */
141+ "%*s " /* (4) root */
142+ "%256s " /* (5) mount point */
143+ "%256s" /* (6) mount options */
144+ "%*[^-]" /* (7) optional fields */
145+ "- " /* (8) separator */
146+ "%256s " /* (9) file system type */
147+ "%256s" /* (10) mount source */
148+ "%256s" /* (11) mount options 2 */
149+ "%*[^\n]", /* some rubbish at the end */
150+ path,
151+ options,
152+ fstype,
153+ device,
154+ options2)) != 5) {
155+#endif /* HAVE_MSFORMAT */
156 if (k == EOF)
157 break;
158
159--- systemd-pam-185/src/core/umount.c.orig 2012-06-22 23:24:37.000000000 -0400
160+++ systemd-pam-185/src/core/umount.c 2012-06-22 22:56:15.000000000 -0400
161@@ -35,6 +35,8 @@
162 #include "path-util.h"
163 #include "util.h"
164
165+#include "config.h"
166+
167 typedef struct MountPoint {
168 char *path;
169 dev_t devnum;
170@@ -74,7 +76,7 @@
171 MountPoint *m;
172
173 path = p = NULL;
174-
175+#ifdef HAVE_MSFORMAT
176 if ((k = fscanf(proc_self_mountinfo,
177 "%*s " /* (1) mount id */
178 "%*s " /* (2) parent id */
179@@ -89,6 +91,23 @@
180 "%*s" /* (11) mount options 2 */
181 "%*[^\n]", /* some rubbish at the end */
182 &path)) != 1) {
183+#else
184+ path = malloc(257);
185+ if ((k = fscanf(proc_self_mountinfo,
186+ "%*s " /* (1) mount id */
187+ "%*s " /* (2) parent id */
188+ "%*s " /* (3) major:minor */
189+ "%*s " /* (4) root */
190+ "%256s " /* (5) mount point */
191+ "%*s" /* (6) mount options */
192+ "%*[^-]" /* (7) optional fields */
193+ "- " /* (8) separator */
194+ "%*s " /* (9) file system type */
195+ "%*s" /* (10) mount source */
196+ "%*s" /* (11) mount options 2 */
197+ "%*[^\n]", /* some rubbish at the end */
198+ path)) != 1) {
199+#endif /* HAVE_MSFORMAT */
200 if (k == EOF)
201 break;
202
203@@ -150,7 +169,7 @@
204 MountPoint *swap;
205 char *dev = NULL, *d;
206 int k;
207-
208+#ifdef HAVE_MSFORMAT
209 if ((k = fscanf(proc_swaps,
210 "%ms " /* device/file */
211 "%*s " /* type of swap */
212@@ -158,7 +177,16 @@
213 "%*s " /* used */
214 "%*s\n", /* priority */
215 &dev)) != 1) {
216-
217+#else
218+ dev = malloc(257);
219+ if ((k = fscanf(proc_swaps,
220+ "%256s " /* device/file */
221+ "%*s " /* type of swap */
222+ "%*s " /* swap size */
223+ "%*s " /* used */
224+ "%*s\n", /* priority */
225+ dev)) != 1) {
226+#endif /* HAVE_MSFORMAT */
227 if (k == EOF)
228 break;
229
230--- systemd-pam-185/src/shared/socket-util.c.orig 2012-06-22 23:25:00.000000000 -0400
231+++ systemd-pam-185/src/shared/socket-util.c 2012-06-22 22:59:27.000000000 -0400
232@@ -39,6 +39,8 @@
233 #include "socket-util.h"
234 #include "missing.h"
235
236+#include "config.h"
237+
238 int socket_address_parse(SocketAddress *a, const char *s) {
239 int r;
240 char *e, *n;
241@@ -201,8 +203,16 @@
242 a->type = SOCK_RAW;
243
244 errno = 0;
245- if (sscanf(s, "%ms %u", &sfamily, &group) < 1)
246+#ifdef HAVE_MSFORMAT
247+ if (sscanf(s, "%ms %u", &sfamily, &group) < 1)
248+ return errno ? -errno : -EINVAL;
249+#else
250+ sfamily = malloc(257);
251+ if (sscanf(s, "%256s %u", sfamily, &group) < 1) {
252+ free(sfamily);
253 return errno ? -errno : -EINVAL;
254+ }
255+#endif /* HAVE_MSFORMAT */
256
257 if ((family = netlink_family_from_string(sfamily)) < 0)
258 if (safe_atoi(sfamily, &family) < 0) {
259--- systemd-pam-185/src/tmpfiles/tmpfiles.c.orig 2012-06-22 23:25:21.000000000 -0400
260+++ systemd-pam-185/src/tmpfiles/tmpfiles.c 2012-06-22 23:13:49.000000000 -0400
261@@ -48,6 +48,8 @@
262 #include "set.h"
263 #include "conf-files.h"
264
265+#include "config.h"
266+
267 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
268 * them in the file system. This is intended to be used to create
269 * properly owned directories beneath /tmp, /var/tmp, /run, which are
270@@ -970,7 +972,7 @@
271 i = new0(Item, 1);
272 if (!i)
273 return log_oom();
274-
275+#ifdef HAVE_MSFORMAT
276 if (sscanf(buffer,
277 "%c "
278 "%ms "
279@@ -986,6 +988,28 @@
280 &group,
281 &age,
282 &n) < 2) {
283+#else
284+ i->path = malloc(257);
285+ mode = malloc(257);
286+ user = malloc(257);
287+ group = malloc(257);
288+ age = malloc(257);
289+ if (sscanf(buffer,
290+ "%c "
291+ "%256s "
292+ "%256s "
293+ "%256s "
294+ "%256s "
295+ "%256s "
296+ "%n",
297+ &type,
298+ i->path,
299+ mode,
300+ user,
301+ group,
302+ age,
303+ &n) < 2) {
304+#endif /* HAVE_MSFORMAT */
305 log_error("[%s:%u] Syntax error.", fname, line);
306 r = -EIO;
307 goto finish;
308--- systemd-pam-185/src/cryptsetup/cryptsetup-generator.c.orig 2012-06-22 23:25:47.000000000 -0400
309+++ systemd-pam-185/src/cryptsetup/cryptsetup-generator.c 2012-06-22 23:16:35.000000000 -0400
310@@ -30,6 +30,8 @@
311 #include "virt.h"
312 #include "strv.h"
313
314+#include "config.h"
315+
316 static const char *arg_dest = "/tmp";
317 static bool arg_enabled = true;
318 static bool arg_read_crypttab = true;
319@@ -421,8 +423,15 @@
320 l = strstrip(line);
321 if (*l == '#' || *l == 0)
322 continue;
323-
324+#ifdef HAVE_MSFORMAT
325 k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
326+#else
327+ name = malloc(257);
328+ device = malloc(257);
329+ password = malloc(257);
330+ options = malloc(257);
331+ k = sscanf(l, "%256s %256s %256s %256s", name, device, password, options);
332+#endif /* HAVE_MSFORMAT */
333 if (k < 2 || k > 4) {
334 log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
335 r = EXIT_FAILURE;
diff --git a/meta-systemd/recipes-core/systemd/systemd/touchscreen.rules b/meta-systemd/recipes-core/systemd/systemd/touchscreen.rules
deleted file mode 100644
index d83fd1673d..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/touchscreen.rules
+++ /dev/null
@@ -1,18 +0,0 @@
1# There are a number of modifiers that are allowed to be used in some
2# of the different fields. They provide the following subsitutions:
3#
4# %n the "kernel number" of the device.
5# For example, 'sda3' has a "kernel number" of '3'
6# %e the smallest number for that name which does not matches an existing node
7# %k the kernel name for the device
8# %M the kernel major number for the device
9# %m the kernel minor number for the device
10# %b the bus id for the device
11# %c the string returned by the PROGRAM
12# %s{filename} the content of a sysfs attribute
13# %% the '%' char itself
14#
15
16# Create a symlink to any touchscreen input device
17SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
18SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/meta-systemd/recipes-core/systemd/systemd/var-run.conf b/meta-systemd/recipes-core/systemd/systemd/var-run.conf
deleted file mode 100644
index c2c18e2b99..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd/var-run.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1# empty /var/run
2R /var/run/* - - - - -
3# systemd-update-utmp-runlevel.service fails to start without this
4f /var/run/utmp 0644 root root - -
diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
deleted file mode 100644
index f2e168e9ba..0000000000
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ /dev/null
@@ -1,263 +0,0 @@
1DESCRIPTION = "Systemd a init replacement"
2HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
3
4LICENSE = "GPLv2 & LGPLv2.1 & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
6 file://LICENSE.LGPL2.1;md5=f0df8fd67dfa1db3cc0bd431837f0b89 \
7 file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed"
8
9PROVIDES = "udev"
10
11DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt python"
12DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
13
14SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
15
16SECTION = "base/shell"
17
18inherit gitpkgv
19PKGV = "v${GITPKGVTAG}"
20
21PV = "git"
22PR = "r13"
23
24# need to export these variables for python-config to work
25export BUILD_SYS
26export HOST_SYS
27export STAGING_INCDIR
28export STAGING_LIBDIR
29
30inherit useradd pkgconfig autotools perlnative pythonnative python-dir
31
32SRCREV = "decd634e801bee2c554edb35383cc9d43417a850"
33SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
34 file://0001-Revert-systemd-analyze-use-argparse-instead-of-getop.patch \
35 file://0002-Revert-analyze-use-GDBus-instead-of-dbus-python.patch \
36 file://gtk-doc.make \
37 file://touchscreen.rules \
38 file://modprobe.rules \
39 file://var-run.conf \
40 ${UCLIBCPATCHES} \
41 "
42UCLIBCPATCHES = ""
43UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \
44 file://systemd-pam-fix-execvpe.patch \
45 file://systemd-pam-fix-fallocate.patch \
46 file://systemd-pam-fix-getty-unit.patch \
47 file://systemd-pam-fix-mkostemp.patch \
48 file://systemd-pam-fix-msformat.patch \
49 file://optional_secure_getenv.patch \
50 "
51LDFLAGS_libc-uclibc_append = " -lrt"
52
53S = "${WORKDIR}/git"
54
55SYSTEMDDISTRO ?= "debian"
56SYSTEMDDISTRO_angstrom = "angstrom"
57
58CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \
59 ac_cv_file__usr_share_hwdata_pci_ids=no \
60 ac_cv_file__usr_share_misc_pci_ids=yes"
61# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
62EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
63 --with-rootprefix=${base_prefix} \
64 --with-rootlibdir=${base_libdir} \
65 --sbindir=${base_sbindir} \
66 --libexecdir=${base_libdir} \
67 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
68 --enable-xz \
69 --disable-manpages \
70 --disable-coredump \
71 --disable-introspection \
72 --with-pci-ids-path=/usr/share/misc \
73 --disable-gtk-doc-html \
74 --disable-tcpwrap \
75 --enable-split-usr \
76 --disable-microhttpd \
77 --with-python \
78 "
79
80# There's no docbook-xsl-native, so for the xsltproc check to false
81do_configure_prepend() {
82 export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
83 sed -i /xsltproc/d configure.ac
84
85 cp ${WORKDIR}/gtk-doc.make ${S}/docs/
86
87 # we only have /home/root, not /root
88 sed -i -e 's:=/root:=/home/root:g' units/*.service*
89}
90
91do_install() {
92 autotools_do_install
93 install -d ${D}${base_sbindir}
94 # provided by a seperate recipe
95 rm ${D}${systemd_unitdir}/system/serial-getty* -f
96
97 # provide support for initramfs
98 ln -s ${systemd_unitdir}/systemd ${D}/init
99
100 # create dir for journal
101 install -d ${D}${localstatedir}/log/journal
102 # udevd is needed in initramfs which was provided by udev in OE-Core
103 # so we need to provide that otherwise it pulls in both systemd and
104 # udev
105 ln -s ${systemd_unitdir}/systemd-udevd ${D}${base_sbindir}/udevd
106 # create machine-id
107 # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
108 touch ${D}${sysconfdir}/machine-id
109
110 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
111
112 install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
113}
114
115python populate_packages_prepend (){
116 systemdlibdir = d.getVar("base_libdir", True)
117 do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
118}
119PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
120
121PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze python-${PN}-journal"
122
123USERADD_PACKAGES = "${PN}"
124GROUPADD_PARAM_${PN} = "-r lock"
125
126FILES_${PN}-analyze = "${bindir}/systemd-analyze"
127RDEPENDS_${PN}-analyze = "python-dbus python-argparse python-textutils"
128RRECOMMENDS_${PN}-analyze = "python-pycairo"
129
130FILES_python-${PN}-journal = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
131RDEPENDS_python-${PN}-journal = "python-core"
132
133FILES_${PN}-initramfs = "/init"
134RDEPENDS_${PN}-initramfs = "${PN}"
135
136FILES_${PN}-gui = "${bindir}/systemadm"
137
138FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
139 ${systemd_unitdir}/system/systemd-vconsole-setup.service \
140 ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
141
142RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts"
143
144CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \
145 ${sysconfdir}/systemd/logind.conf \
146 ${sysconfdir}/systemd/system.conf \
147 ${sysconfdir}/systemd/user.conf"
148
149FILES_${PN} = " ${base_bindir}/* \
150 ${datadir}/dbus-1/services \
151 ${datadir}/dbus-1/system-services \
152 ${datadir}/polkit-1 \
153 ${datadir}/${PN} \
154 ${sysconfdir}/bash_completion.d/ \
155 ${sysconfdir}/binfmt.d/ \
156 ${sysconfdir}/dbus-1/ \
157 ${sysconfdir}/machine-id \
158 ${sysconfdir}/modules-load.d/ \
159 ${sysconfdir}/sysctl.d/ \
160 ${sysconfdir}/systemd/ \
161 ${sysconfdir}/tmpfiles.d/ \
162 ${sysconfdir}/xdg/ \
163 ${sysconfdir}/init.d/README \
164 ${systemd_unitdir}/* \
165 ${systemd_unitdir}/system/* \
166 /lib/udev/rules.d/99-systemd.rules \
167 ${base_libdir}/security/*.so \
168 /cgroup \
169 ${bindir}/systemd* \
170 ${bindir}/localectl \
171 ${bindir}/hostnamectl \
172 ${bindir}/timedatectl \
173 ${exec_prefix}/lib/tmpfiles.d/*.conf \
174 ${exec_prefix}/lib/systemd \
175 ${exec_prefix}/lib/binfmt.d \
176 ${exec_prefix}/lib/modules-load.d \
177 ${exec_prefix}/lib/sysctl.d \
178 ${localstatedir} \
179 ${libexecdir} \
180 /lib/udev/rules.d/70-uaccess.rules \
181 /lib/udev/rules.d/71-seat.rules \
182 /lib/udev/rules.d/73-seat-late.rules \
183 /lib/udev/rules.d/99-systemd.rules \
184 "
185FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/ ${PYTHON_SITEPACKAGES_DIR}/systemd/.debug/"
186FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd ${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"
187
188RDEPENDS_${PN} += "udev-systemd"
189
190# kbd -> loadkeys,setfont
191# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
192# of blacklist support, so use proper modprobe from module-init-tools
193# And pull in the kernel modules mentioned in INSTALL
194# swapon -p is also not supported by busybox
195# busybox mount is broken
196RRECOMMENDS_${PN} += "systemd-serialgetty \
197 util-linux-agetty \
198 util-linux-swaponoff \
199 util-linux-fsck e2fsprogs-e2fsck \
200 module-init-tools \
201 util-linux-mount util-linux-umount \
202 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
203"
204
205PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd"
206
207FILES_udev-dbg += "/lib/udev/.debug"
208
209RDEPENDS_udev += "udev-utils"
210RPROVIDES_udev = "hotplug"
211
212FILES_udev += "${base_sbindir}/udevd \
213 /lib/udev/udevd \
214 /lib/systemd/systemd-udevd \
215 /lib/udev/accelerometer \
216 /lib/udev/ata_id \
217 /lib/udev/cdrom_id \
218 /lib/udev/collect \
219 /lib/udev/findkeyboards \
220 /lib/udev/keyboard-force-release.sh \
221 /lib/udev/keymap \
222 /lib/udev/mtd_probe \
223 /lib/udev/scsi_id \
224 /lib/udev/v4l_id \
225 /lib/udev/keymaps \
226 /lib/udev/rules.d/4*.rules \
227 /lib/udev/rules.d/5*.rules \
228 /lib/udev/rules.d/6*.rules \
229 /lib/udev/rules.d/70-power-switch.rules \
230 /lib/udev/rules.d/75*.rules \
231 /lib/udev/rules.d/78*.rules \
232 /lib/udev/rules.d/8*.rules \
233 /lib/udev/rules.d/95*.rules \
234 /lib/udev/hwdb.d \
235 ${sysconfdir}/udev \
236 "
237
238FILES_udev-consolekit += "/lib/ConsoleKit"
239RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
240
241FILES_udev-utils = "${bindir}/udevadm"
242
243FILES_udev-systemd = "${systemd_unitdir}/system/*udev* ${systemd_unitdir}/system/*.wants/*udev*"
244RDEPENDS_udev-systemd = "udev"
245
246# TODO:
247# u-a for runlevel and telinit
248
249pkg_postinst_systemd () {
250update-alternatives --install ${base_sbindir}/init init ${systemd_unitdir}/systemd 300
251update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
252update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
253update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
254update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300
255}
256
257pkg_prerm_systemd () {
258update-alternatives --remove init ${systemd_unitdir}/systemd
259update-alternatives --remove halt ${base_bindir}/systemctl
260update-alternatives --remove reboot ${base_bindir}/systemctl
261update-alternatives --remove shutdown ${base_bindir}/systemctl
262update-alternatives --remove poweroff ${base_bindir}/systemctl
263}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-20 15:24:08 +0000