diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-07-11 13:24:32 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:05 +0200 |
commit | a5b2aea321b2851ed82828e6204c075a2329059c (patch) | |
tree | 06c57ad79e5cdcb0b8b62bb6e910c29c379fac8c /meta-systemd/recipes-core | |
parent | 5ed19733f5193b752da650841a1383adb532fffd (diff) | |
download | meta-openembedded-contrib-a5b2aea321b2851ed82828e6204c075a2329059c.tar.gz |
move systemd recipes to meta-systemd
Diffstat (limited to 'meta-systemd/recipes-core')
13 files changed, 1196 insertions, 0 deletions
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb new file mode 100644 index 0000000000..c9a6b679e1 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r15" + +inherit allarch + +SRC_URI = "file://*.service" + +do_install() { + install -d ${D}${systemd_unitdir}/system/basic.target.wants + install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ + install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system + ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/ + ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ + + install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system + ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ + ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/ + + # hack to make old style sysvinit postinsts succeed + install -d ${D}${bindir} + echo "echo 1" > ${D}${bindir}/runlevel + chmod 0755 ${D}${bindir}/runlevel +} + +pkg_postinst_${PN} () { +cd $D${sysconfdir}/init.d + +echo -n "Disabling the following sysv scripts: " + +for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog syslog.busybox ; do + if [ -e $i ] ; then + echo -n "$i " ; ln -s /dev/null $D${systemd_unitdir}/system/$i.service + fi +done ; echo +} + +FILES_${PN} = "${systemd_unitdir}/system ${bindir}" +RDPEPENDS_${PN} = "systemd" + + diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service b/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service new file mode 100644 index 0000000000..cab8f76ab8 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service @@ -0,0 +1,16 @@ +[Unit] +Description=Machine ID first boot configure +DefaultDependencies=no +ConditionPathExists=|!/etc/machine-id +After=remount-rootfs.service +Before=sysinit.target + +[Service] +ExecStart=/bin/systemd-machine-id-setup +RemainAfterExit=No +Type=oneshot +StandardOutput=syslog + +[Install] +WantedBy=basic.target +WantedBy=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 new file mode 100644 index 0000000000..879a25157b --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service @@ -0,0 +1,17 @@ +[Unit] +Description=Run pending postinsts +DefaultDependencies=no +ConditionPathExists=|/etc/rcS.d/S98run-postinsts +After=remount-rootfs.service +Before=sysinit.target + +[Service] +ExecStart=/etc/rcS.d/S98run-postinsts +RemainAfterExit=No +Type=oneshot +StandardOutput=syslog +TimeoutSec=0 + +[Install] +WantedBy=basic.target +WantedBy=sysinit.target diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb new file mode 100644 index 0000000000..f33b2a9833 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Machine specific systemd units" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PR = "r1" + +inherit systemd +SYSTEMD_SERVICE = "" +SYSTEMD_PACKAGES = "${PN}" +NATIVE_SYSTEMD_SUPPORT = "1" +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb b/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb new file mode 100644 index 0000000000..c3106722f6 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Systemd serial config" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +PR = "r3" + +SERIAL_CONSOLE ?= "115200 ttyS0" + +SRC_URI = "file://LICENSE \ + file://serial-getty@.service" + +def get_serial_console_value(d, index): + c = d.getVar('SERIAL_CONSOLE', True) + + if len(c): + return c.split()[index] + + return "" + +def get_baudrate(d): + return get_serial_console_value(d, 0) + +def get_console(d): + return get_serial_console_value(d, 1) + +do_install() { + if [ ! ${@get_baudrate(d)} = "" ]; then + sed -i -e s/\@BAUDRATE\@/${@get_baudrate(d)}/g ${WORKDIR}/serial-getty@.service + install -d ${D}${systemd_unitdir}/system/ + install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ + install ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/ + + # enable the service + ln -sf ${systemd_unitdir}/system/serial-getty@.service \ + ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(d)}.service + fi +} + +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc" + +RRECOMMENDS_${PN} = "" +RDEPENDS_${PN} = "systemd" + +# This is a machine specific file +FILES_${PN} = "${systemd_unitdir}/system/serial-getty@.service ${sysconfdir}" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE b/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE new file mode 100644 index 0000000000..d511905c16 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public 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 new file mode 100644 index 0000000000..8eeaab697c --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service @@ -0,0 +1,32 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Serial Getty on %I +BindTo=dev-%i.device +After=dev-%i.device systemd-user-sessions.service + +# If additional gettys are spawned during boot then we should make +# sure that this is synchronized before getty.target, even though +# getty.target didn't actually pull it in. +Before=getty.target + +[Service] +Environment=TERM=vt100 +ExecStart=-/sbin/agetty -s %I @BAUDRATE@ +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=yes +KillMode=process +IgnoreSIGPIPE=no + +# Some login implementations ignore SIGTERM, so we send SIGHUP +# instead, to ensure that login terminates cleanly. +KillSignal=SIGHUP diff --git a/meta-systemd/recipes-core/systemd/systemd-speed-hacks.bb b/meta-systemd/recipes-core/systemd/systemd-speed-hacks.bb new file mode 100644 index 0000000000..8cfcc4c378 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-speed-hacks.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Collection of hacks to speed up systemd boot" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r1" + +inherit allarch + +ALLOW_EMPTY_${PN} = "1" + +pkg_postinst_${PN} () { +#!/bin/sh +# I can run offline +rm -f $D/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service + +rm -f $D/lib/systemd/system/sysinit.target.wants/sys-fs-fuse-connections.mount +rm -f $D/lib/systemd/system/sysinit.target.wants/sys-kernel-debug.mount +} diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb new file mode 100644 index 0000000000..7ca77ae18a --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Wrapper to enable of systemd services" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r3" + +inherit native + +SRC_URI = "file://systemctl" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} +} diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl new file mode 100755 index 0000000000..ff9e6a7512 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl @@ -0,0 +1,91 @@ +#!/bin/sh +echo "Started $0 $*" + +ROOT= + +# parse command line params +action= +while [ $# != 0 ]; do + opt="$1" + + case "$opt" in + enable) + shift + + action="$opt" + services="$1" + cmd_args="1" + shift + ;; + disable) + shift + + action="$opt" + services="$1" + cmd_args="1" + shift + ;; + --root=*) + ROOT=${opt##--root=} + cmd_args="0" + shift + ;; + *) + if [ "$cmd_args" = "1" ]; then + services="$services $opt" + shift + else + echo "'$opt' is an unkown option; exiting with error" + exit 1 + fi + ;; + esac +done + +for service in $services; do + echo "Try to find location of $service..." + # find service file + for p in $ROOT/etc/systemd/system \ + $ROOT/lib/systemd/system \ + $ROOT/usr/lib/systemd/system; do + if [ -e $p/$service ]; then + service_file=$p/$service + service_file=${service_file##$ROOT} + fi + done + if [ -z "$service_file" ]; then + echo "'$service' couldn't be found; exiting with error" + exit 1 + fi + echo "Found $service in $service_file" + + # create the required symbolic links + wanted_by=$(grep WantedBy $ROOT/$service_file \ + | sed 's,WantedBy=,,g' \ + | tr ',' '\n' \ + | grep '\.target$') + + for r in $wanted_by; do + echo "WantedBy=$r found in $service" + if [ "$action" = "enable" ]; then + mkdir -p $ROOT/etc/systemd/system/$r.wants + ln -s $service_file $ROOT/etc/systemd/system/$r.wants + echo "Enabled $service for $wanted_by." + else + rm -f $ROOT/etc/systemd/system/$r.wants/$service + rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants + echo "Disabled $service for $wanted_by." + fi + done + + # call us for the other required scripts + also=$(grep Also $ROOT/$service_file \ + | sed 's,Also=,,g' \ + | tr ',' '\n') + for a in $also; do + echo "Also=$a found in $service" + if [ "$action" = "enable" ]; then + $0 --root=$ROOT enable $a + fi + done +done diff --git a/meta-systemd/recipes-core/systemd/systemd/format-replace-m-uclibc.patch b/meta-systemd/recipes-core/systemd/systemd/format-replace-m-uclibc.patch new file mode 100644 index 0000000000..dd86121bb8 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd/format-replace-m-uclibc.patch @@ -0,0 +1,389 @@ +Patch from Henning. %m is a glibc only thing. For uclibc we need to do it +differently. So we use static strings instead of mallocing them and free'ing + +I dont know if upstream systemd have plans to make systemd work on non +glibc system libraries if not then this patch would not make sense for +upstream + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: git/src/mount-setup.c +=================================================================== +--- git.orig/src/mount-setup.c 2012-01-26 21:15:12.573084007 -0800 ++++ git/src/mount-setup.c 2012-01-26 21:15:16.005084174 -0800 +@@ -182,10 +182,10 @@ + (void) fgets(buf, sizeof(buf), f); + + for (;;) { +- char *controller; ++ char controller[30]; + int enabled = 0; + +- if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) { ++ if (fscanf(f, "%s %*i %*i %i", controller, &enabled) != 2) { + + if (feof(f)) + break; +@@ -196,14 +196,12 @@ + } + + if (!enabled) { +- free(controller); + continue; + } + + r = set_put(controllers, controller); + if (r < 0) { + log_error("Failed to add controller to set."); +- free(controller); + goto finish; + } + } +@@ -273,7 +271,6 @@ + p.fatal = false; + + r = mount_one(&p, true); +- free(controller); + free(where); + + if (r < 0) { +Index: git/src/socket-util.c +=================================================================== +--- git.orig/src/socket-util.c 2012-01-26 21:15:12.593084008 -0800 ++++ git/src/socket-util.c 2012-01-26 21:15:16.005084174 -0800 +@@ -192,7 +192,7 @@ + int socket_address_parse_netlink(SocketAddress *a, const char *s) { + int family; + unsigned group = 0; +- char* sfamily = NULL; ++ char sfamily[50]; + assert(a); + assert(s); + +@@ -200,17 +200,14 @@ + a->type = SOCK_RAW; + + errno = 0; +- if (sscanf(s, "%ms %u", &sfamily, &group) < 1) ++ if (sscanf(s, "%49s %u", &sfamily, &group) < 1) + return errno ? -errno : -EINVAL; + + if ((family = netlink_family_from_string(sfamily)) < 0) + if (safe_atoi(sfamily, &family) < 0) { +- free(sfamily); + return -EINVAL; + } + +- free(sfamily); +- + a->sockaddr.nl.nl_family = AF_NETLINK; + a->sockaddr.nl.nl_groups = group; + +Index: git/src/swap.c +=================================================================== +--- git.orig/src/swap.c 2012-01-26 21:15:12.593084008 -0800 ++++ git/src/swap.c 2012-01-26 21:15:16.005084174 -0800 +@@ -1049,11 +1049,12 @@ + (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); + + for (i = 1;; i++) { +- char *dev = NULL, *d; ++ char *d; ++ char dev[20]; + int prio = 0, k; + + if ((k = fscanf(m->proc_swaps, +- "%ms " /* device/file */ ++ "%19s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ +@@ -1064,12 +1065,10 @@ + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); +- free(dev); + continue; + } + + d = cunescape(dev); +- free(dev); + + if (!d) + return -ENOMEM; +Index: git/src/tmpfiles.c +=================================================================== +--- git.orig/src/tmpfiles.c 2012-01-26 21:15:12.617084010 -0800 ++++ git/src/tmpfiles.c 2012-01-26 23:17:01.185437712 -0800 +@@ -73,8 +73,8 @@ + typedef struct Item { + ItemType type; + +- char *path; +- char *argument; ++ char path[50]; ++ char argument[50]; + uid_t uid; + gid_t gid; + mode_t mode; +@@ -822,7 +822,6 @@ + case CREATE_CHAR_DEVICE: + case CREATE_BLOCK_DEVICE: + case IGNORE_PATH: +- case RELABEL_PATH: + case RECURSIVE_RELABEL_PATH: + case WRITE_FILE: + break; +@@ -858,8 +857,6 @@ + static void item_free(Item *i) { + assert(i); + +- free(i->path); +- free(i->argument); + free(i); + } + +@@ -906,7 +903,7 @@ + + static int parse_line(const char *fname, unsigned line, const char *buffer) { + Item *i, *existing; +- char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; ++ char mode[50], user[50], group[50], age[50]; + char type; + Hashmap *h; + int r, n = -1; +@@ -923,18 +920,18 @@ + + if (sscanf(buffer, + "%c " +- "%ms " +- "%ms " +- "%ms " +- "%ms " +- "%ms " ++ "%s " ++ "%s " ++ "%s " ++ "%s " ++ "%s " + "%n", + &type, + &i->path, +- &mode, +- &user, +- &group, +- &age, ++ mode, ++ user, ++ group, ++ age, + &n) < 2) { + log_error("[%s:%u] Syntax error.", fname, line); + r = -EIO; +@@ -944,7 +941,7 @@ + if (n >= 0) { + n += strspn(buffer+n, WHITESPACE); + if (buffer[n] != 0 && (buffer[n] != '-' || buffer[n+1] != 0)) { +- i->argument = unquote(buffer+n, "\""); ++ strcpy(i->argument, unquote(buffer+n, "\"")); + if (!i->argument) { + log_error("Out of memory"); + return -ENOMEM; +@@ -1096,11 +1093,6 @@ + r = 0; + + finish: +- free(user); +- free(group); +- free(mode); +- free(age); +- + if (i) + item_free(i); + +Index: git/src/mount.c +=================================================================== +--- git.orig/src/mount.c 2012-01-26 21:15:12.573084007 -0800 ++++ git/src/mount.c 2012-01-26 21:15:16.005084174 -0800 +@@ -24,6 +24,7 @@ + #include <mntent.h> + #include <sys/epoll.h> + #include <signal.h> ++#include <string.h> + + #include "unit.h" + #include "mount.h" +@@ -1561,7 +1562,13 @@ + static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { + int r = 0; + unsigned i; +- char *device, *path, *options, *options2, *fstype, *d, *p, *o; ++ char *d, *p, *o; ++ char device[50]; ++ char path[50]; ++ char options[50]; ++ char options2[50]; ++ char fstype[50]; ++ + + assert(m); + +@@ -1570,26 +1577,26 @@ + for (i = 1;; i++) { + int k; + +- device = path = options = options2 = fstype = d = p = o = NULL; ++ d = p = o = NULL; + + if ((k = fscanf(m->proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ +- "%ms " /* (5) mount point */ +- "%ms" /* (6) mount options */ ++ "%49s " /* (5) mount point */ ++ "%49s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +- "%ms " /* (9) file system type */ +- "%ms" /* (10) mount source */ +- "%ms" /* (11) mount options 2 */ ++ "%49s " /* (9) file system type */ ++ "%49s" /* (10) mount source */ ++ "%49s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &path, +- &options, +- &fstype, +- &device, +- &options2)) != 5) { ++ path, ++ options, ++ fstype, ++ device, ++ options2)) != 5) { + + if (k == EOF) + break; +@@ -1613,22 +1620,12 @@ + r = k; + + clean_up: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); + } + + finish: +- free(device); +- free(path); +- free(options); +- free(options2); +- free(fstype); + free(d); + free(p); + free(o); +Index: git/src/umount.c +=================================================================== +--- git.orig/src/umount.c 2012-01-26 21:15:12.617084010 -0800 ++++ git/src/umount.c 2012-01-26 21:15:16.005084174 -0800 +@@ -60,7 +60,9 @@ + + static int mount_points_list_get(MountPoint **head) { + FILE *proc_self_mountinfo; +- char *path, *p; ++ char *p; ++ char path[50]; ++ + unsigned int i; + int r; + +@@ -72,17 +74,17 @@ + for (i = 1;; i++) { + int k; + MountPoint *m; +- char *root; ++ char root[50]; + bool skip_ro; + +- path = p = NULL; ++ p = NULL; + + if ((k = fscanf(proc_self_mountinfo, + "%*s " /* (1) mount id */ + "%*s " /* (2) parent id */ + "%*s " /* (3) major:minor */ +- "%ms " /* (4) root */ +- "%ms " /* (5) mount point */ ++ "%49s " /* (4) root */ ++ "%49s " /* (5) mount point */ + "%*s" /* (6) mount options */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +@@ -90,24 +92,21 @@ + "%*s" /* (10) mount source */ + "%*s" /* (11) mount options 2 */ + "%*[^\n]", /* some rubbish at the end */ +- &root, +- &path)) != 2) { ++ root, ++ path)) != 2) { + if (k == EOF) + break; + + log_warning("Failed to parse /proc/self/mountinfo:%u.", i); + +- free(path); + continue; + } + + /* If we encounter a bind mount, don't try to remount + * the source dir too early */ + skip_ro = !streq(root, "/"); +- free(root); + + p = cunescape(path); +- free(path); + + if (!p) { + r = -ENOMEM; +@@ -152,28 +151,28 @@ + + for (i = 2;; i++) { + MountPoint *swap; +- char *dev = NULL, *d; ++ char *d; ++ char dev[50]; ++ + int k; + + if ((k = fscanf(proc_swaps, +- "%ms " /* device/file */ ++ "%50s " /* device/file */ + "%*s " /* type of swap */ + "%*s " /* swap size */ + "%*s " /* used */ + "%*s\n", /* priority */ +- &dev)) != 1) { ++ dev)) != 1) { + + if (k == EOF) + break; + + log_warning("Failed to parse /proc/swaps:%u.", i); + +- free(dev); + continue; + } + + if (endswith(dev, "(deleted)")) { +- free(dev); + continue; + } + diff --git a/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch b/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file mode 100644 index 0000000000..ca10440a8d --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch @@ -0,0 +1,19 @@ +uclibc does not have mkostemp() so we redefine it to use mkstemp() + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: git/src/macro.h +=================================================================== +--- git.orig/src/macro.h 2011-06-30 10:33:53.000000000 -0700 ++++ git/src/macro.h 2011-06-30 15:07:28.285270006 -0700 +@@ -27,6 +27,10 @@ + #include <sys/uio.h> + #include <inttypes.h> + ++#ifdef __UCLIBC__ ++/* uclibc does not implement mkostemp GNU extention */ ++#define mkostemp(x,y) mkstemp(x) ++#endif + #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b))) + #define _sentinel_ __attribute__ ((sentinel)) + #define _noreturn_ __attribute__((noreturn)) diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb new file mode 100644 index 0000000000..f4ca72a128 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd_git.bb @@ -0,0 +1,156 @@ +DESCRIPTION = "Systemd a init replacement" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +SERIAL_CONSOLE ?= "115200 /dev/ttyS0" + +SECTION = "base/shell" + +inherit gitpkgv +PKGV = "v${GITPKGVTAG}" + +PV = "git" +PR = "r27" + +inherit useradd pkgconfig autotools vala perlnative + +SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443" + +SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ + ${UCLIBCPATCHES} \ + " +UCLIBCPATCHES = "" +UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ + file://format-replace-m-uclibc.patch \ + " + +LDFLAGS_libc-uclibc_append = " -lrt" + +S = "${WORKDIR}/git" + +SYSTEMDDISTRO ?= "debian" +SYSTEMDDISTRO_angstrom = "angstrom" + +# The gtk+ tools should get built as a separate recipe e.g. systemd-tools +EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ + --with-rootprefix=${base_prefix} \ + --with-rootlibdir=${base_libdir} \ + ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ + --disable-gtk \ + --enable-xz \ + --disable-manpages \ + --disable-coredump \ + " + +# There's no docbook-xsl-native, so for the xsltproc check to false +do_configure_prepend() { + sed -i /xsltproc/d configure.ac + + # we only have /home/root, not /root + sed -i -e 's:=/root:=/home/root:g' units/*.service* +} + +do_install() { + autotools_do_install + # provided by a seperate recipe + rm ${D}${systemd_unitdir}/system/serial-getty* -f + + # provide support for initramfs + ln -s ${systemd_unitdir}/systemd ${D}/init + + # create dir for journal + install -d ${D}${localstatedir}/log/journal + + # create machine-id + # 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 + touch ${D}${sysconfdir}/machine-id +} + +python populate_packages_prepend (){ + systemdlibdir = d.getVar("base_libdir", True) + do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) +} + +PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r lock" + +FILES_${PN}-analyze = "${bindir}/systemd-analyze" +RDEPENDS_${PN}-analyze = "python-dbus" +RRECOMMENDS_${PN}-analyze = "python-pycairo" + +FILES_${PN}-initramfs = "/init" +RDEPENDS_${PN}-initramfs = "${PN}" + +FILES_${PN}-gui = "${bindir}/systemadm" + +FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \ + ${systemd_unitdir}/system/systemd-vconsole-setup.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" + +RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts" + +FILES_${PN} = " ${base_bindir}/* \ + ${datadir}/dbus-1/services \ + ${datadir}/dbus-1/system-services \ + ${datadir}/polkit-1 \ + ${datadir}/${PN} \ + ${sysconfdir} \ + ${systemd_unitdir}/* \ + ${systemd_unitdir}/system/* \ + ${base_libdir}/udev/rules.d \ + ${base_libdir}/security/*.so \ + /cgroup \ + ${bindir}/systemd* \ + ${libdir}/tmpfiles.d/*.conf \ + ${libdir}/systemd \ + ${libdir}/binfmt.d \ + ${libdir}/modules-load.d \ + ${libdir}/sysctl.d \ + ${localstatedir} \ + ${libexecdir} \ + " + +FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" +FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/" + +RDEPENDS_${PN} += "dbus-systemd udev-systemd" + +# kbd -> loadkeys,setfont +# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack +# of blacklist support, so use proper modprobe from module-init-tools +# And pull in the kernel modules mentioned in INSTALL +# swapon -p is also not supported by busybox +# busybox mount is broken +RRECOMMENDS_${PN} += "systemd-serialgetty \ + util-linux-agetty \ + util-linux-swaponoff \ + util-linux-fsck e2fsprogs-e2fsck \ + module-init-tools \ + util-linux-mount util-linux-umount \ + kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ +" + +# TODO: +# u-a for runlevel and telinit + +pkg_postinst_systemd () { +update-alternatives --install ${base_sbindir}/init init ${systemd_unitdir}/systemd 300 +update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300 +update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300 +update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300 +update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300 +} + +pkg_prerm_systemd () { +update-alternatives --remove init ${systemd_unitdir}/systemd +update-alternatives --remove halt ${base_bindir}/systemctl +update-alternatives --remove reboot ${base_bindir}/systemctl +update-alternatives --remove shutdown ${base_bindir}/systemctl +update-alternatives --remove poweroff ${base_bindir}/systemctl +} |