* [meta-oe][PATCH 0/5] SystemD fixes and improvements
@ 2011-10-21 13:55 Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 1/5] systemd-serialgetty: don't require systemd_git.bb Otavio Salvador
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 36423031ae2cc2157232f3bec8f5c9fa53ef215d:
Cloud9: incremental submodule and build fixes (2011-10-21 14:57:30 +0200)
are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master
Otavio Salvador (5):
systemd-serialgetty: don't require systemd_git.bb
systemd: add systemd-initramfs
systemd: add lock group using useradd.bbclass
systemd: do not recommend systemd-serialgetty
task-basic: add "serial-console" machine feature
.../recipes-core/systemd/systemd-serialgetty.bb | 23 +-
.../systemd/systemd-serialgetty/LICENSE | 339 ++++++++++++++++++++
meta-oe/recipes-core/systemd/systemd_git.bb | 24 +-
meta-oe/recipes-core/tasks/task-basic.bb | 1 +
4 files changed, 360 insertions(+), 27 deletions(-)
create mode 100644 meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE
--
1.7.2.5
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 1/5] systemd-serialgetty: don't require systemd_git.bb
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
@ 2011-10-21 13:55 ` Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 2/5] systemd: add systemd-initramfs Otavio Salvador
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
Avoids the recompile of this package every time systemd is change.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../recipes-core/systemd/systemd-serialgetty.bb | 23 +-
.../systemd/systemd-serialgetty/LICENSE | 339 ++++++++++++++++++++
2 files changed, 347 insertions(+), 15 deletions(-)
create mode 100644 meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
index d7e8571..86d833e 100644
--- a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
@@ -1,19 +1,11 @@
-require systemd_git.bb
-
-SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
- file://serial-getty@.service \
- "
-
DESCRIPTION = "Systemd serial config"
-SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-do_configure() {
- :
-}
+SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
-do_compile() {
- :
-}
+SRC_URI = "file://LICENSE \
+ file://serial-getty@.service"
def get_baudrate(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
@@ -27,9 +19,11 @@ do_install() {
install -d ${D}${base_libdir}/systemd/system/
install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/
+
+ # enable the service
ln -sf ${base_libdir}/systemd/system/serial-getty@.service \
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service
- fi
+ fi
}
PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
@@ -40,4 +34,3 @@ RDEPENDS_${PN} = "systemd"
# This is a machine specific file
FILES_${PN} = "${base_libdir}/systemd/system/serial-getty@.service ${sysconfdir}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE b/meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/meta-oe/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.
--
1.7.2.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 2/5] systemd: add systemd-initramfs
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 1/5] systemd-serialgetty: don't require systemd_git.bb Otavio Salvador
@ 2011-10-21 13:55 ` Otavio Salvador
2011-10-21 14:29 ` Koen Kooi
2011-10-21 13:55 ` [meta-oe][PATCH 3/5] systemd: add lock group using useradd.bbclass Otavio Salvador
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
Includes a /init that points to ${base_sbin}/init that is called so to
avoid having to include post rootfs commands for it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/systemd/systemd_git.bb | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 8faedd0..f9e024b 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r0"
+PR = "r1"
inherit pkgconfig autotools vala perlnative
@@ -52,9 +52,15 @@ do_install() {
autotools_do_install
# provided by a seperate recipe
rm ${D}${base_libdir}/systemd/system/serial-getty* -f
+
+ # provide support for initramfs
+ ln -s ${base_sbindir}/init ${D}/systemd
}
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+
+FILES_${PN}-initramfs = "/init"
+RDEPENDS_${PN}-initramfs = "${PN}"
FILES_${PN}-gui = "${bindir}/systemadm"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 3/5] systemd: add lock group using useradd.bbclass
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 1/5] systemd-serialgetty: don't require systemd_git.bb Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 2/5] systemd: add systemd-initramfs Otavio Salvador
@ 2011-10-21 13:55 ` Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 4/5] systemd: do not recommend systemd-serialgetty Otavio Salvador
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/systemd/systemd_git.bb | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index f9e024b..89ded56 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,9 +14,9 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r1"
+PR = "r2"
-inherit pkgconfig autotools vala perlnative
+inherit useradd pkgconfig autotools vala perlnative
SRCREV = "64685e0cea62b4937f0804e47ce2cb7929f58223"
@@ -59,6 +59,9 @@ do_install() {
PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "-r lock"
+
FILES_${PN}-initramfs = "/init"
RDEPENDS_${PN}-initramfs = "${PN}"
@@ -113,12 +116,4 @@ update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl
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
-
-# can't do this offline, but we need the u-a bits above
-if [ "x$D" != "x" ]; then
- echo "can't do addgroup offline" ; exit 1
-else
- grep "^lock:" /etc/group > /dev/null || addgroup lock
-fi
}
-
--
1.7.2.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 4/5] systemd: do not recommend systemd-serialgetty
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
` (2 preceding siblings ...)
2011-10-21 13:55 ` [meta-oe][PATCH 3/5] systemd: add lock group using useradd.bbclass Otavio Salvador
@ 2011-10-21 13:55 ` Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature Otavio Salvador
2011-10-24 6:55 ` [meta-oe][PATCH 0/5] SystemD fixes and improvements Koen Kooi
5 siblings, 0 replies; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
The service ought to be add if need. Not by default on all images.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/systemd/systemd_git.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 89ded56..9d55a0d 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}"
PV = "git"
-PR = "r2"
+PR = "r3"
inherit useradd pkgconfig autotools vala perlnative
@@ -98,7 +98,6 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
# And pull in the kernel modules mentioned in INSTALL
# swapon -p is also not supported by busybox
RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
- systemd-serialgetty \
util-linux-agetty \
util-linux-swaponoff \
util-linux-fsck e2fsprogs-e2fsck \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
` (3 preceding siblings ...)
2011-10-21 13:55 ` [meta-oe][PATCH 4/5] systemd: do not recommend systemd-serialgetty Otavio Salvador
@ 2011-10-21 13:55 ` Otavio Salvador
2011-10-21 14:04 ` Koen Kooi
2011-10-24 6:55 ` [meta-oe][PATCH 0/5] SystemD fixes and improvements Koen Kooi
5 siblings, 1 reply; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 13:55 UTC (permalink / raw)
To: openembedded-devel
The "serial-console" machine feature makes the task-basic recommends
systemd-serialgetty so serial tty works out of box.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-core/tasks/task-basic.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb
index 34aa7e1..d130313 100644
--- a/meta-oe/recipes-core/tasks/task-basic.bb
+++ b/meta-oe/recipes-core/tasks/task-basic.bb
@@ -47,6 +47,7 @@ RDEPENDS_${PN} = "\
RRECOMMENDS_${PN} = "\
${MACHINE_EXTRA_RRECOMMENDS} \
${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "serial-console", "systemd-serialgetty", "", d)} \
${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \
${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \
\
--
1.7.2.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature
2011-10-21 13:55 ` [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature Otavio Salvador
@ 2011-10-21 14:04 ` Koen Kooi
2011-10-21 15:56 ` Khem Raj
0 siblings, 1 reply; 11+ messages in thread
From: Koen Kooi @ 2011-10-21 14:04 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 21-10-11 15:55, Otavio Salvador schreef:
> The "serial-console" machine feature makes the task-basic recommends
> systemd-serialgetty so serial tty works out of box.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---
> meta-oe/recipes-core/tasks/task-basic.bb | 1 + 1 files changed, 1
> insertions(+), 0 deletions(-)
>
> diff --git a/meta-oe/recipes-core/tasks/task-basic.bb
> b/meta-oe/recipes-core/tasks/task-basic.bb index 34aa7e1..d130313 100644
> --- a/meta-oe/recipes-core/tasks/task-basic.bb +++
> b/meta-oe/recipes-core/tasks/task-basic.bb @@ -47,6 +47,7 @@
> RDEPENDS_${PN} = "\ RRECOMMENDS_${PN} = "\ ${MACHINE_EXTRA_RRECOMMENDS}
> \ ${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ +
> ${@base_contains("MACHINE_FEATURES", "serial-console",
> "systemd-serialgetty", "", d)} \ ${@base_contains("MACHINE_FEATURES",
> "alsa", "alsa-utils-alsamixer", "", d)} \
> ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether
> kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ \
As we discussed briefly on IRC, DISTRO_FEATURE or IMAGE_FEATURE might be
better. So, what do others think?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFOoXviMkyGM64RGpERAheGAJoDXgXaUrRz2CsNGj75/Ftuk0/HEQCePVqo
s2pquzXlMBHh3l1YjLASZSU=
=6Hwz
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/5] systemd: add systemd-initramfs
2011-10-21 13:55 ` [meta-oe][PATCH 2/5] systemd: add systemd-initramfs Otavio Salvador
@ 2011-10-21 14:29 ` Koen Kooi
2011-10-21 14:38 ` Otavio Salvador
0 siblings, 1 reply; 11+ messages in thread
From: Koen Kooi @ 2011-10-21 14:29 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 21-10-11 15:55, Otavio Salvador schreef:
> Includes a /init that points to ${base_sbin}/init that is called so to
> avoid having to include post rootfs commands for it.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---
> meta-oe/recipes-core/systemd/systemd_git.bb | 10 ++++++++-- 1 files
> changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb
> b/meta-oe/recipes-core/systemd/systemd_git.bb index 8faedd0..f9e024b
> 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++
> b/meta-oe/recipes-core/systemd/systemd_git.bb @@ -14,7 +14,7 @@ inherit
> gitpkgv PKGV = "v${GITPKGVTAG}"
>
> PV = "git" -PR = "r0" +PR = "r1"
>
> inherit pkgconfig autotools vala perlnative
>
> @@ -52,9 +52,15 @@ do_install() { autotools_do_install # provided by a
> seperate recipe rm ${D}${base_libdir}/systemd/system/serial-getty* -f + +
> # provide support for initramfs + ln -s ${base_sbindir}/init
> ${D}/systemd }
I wasn't paying attention, sorry. The above needs to be:
ln -s ${base_bindir}/systemd ${D}/init
shall I fix it myself or do you want to send a patch?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFOoYHPMkyGM64RGpERAtmbAJ42uS1WPeIwDl0SBUC055oZa9gnfACeNNLO
V8rl5ePtsBq4ReGOtP8g8Ho=
=sQxg
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 2/5] systemd: add systemd-initramfs
2011-10-21 14:29 ` Koen Kooi
@ 2011-10-21 14:38 ` Otavio Salvador
0 siblings, 0 replies; 11+ messages in thread
From: Otavio Salvador @ 2011-10-21 14:38 UTC (permalink / raw)
To: openembedded-devel
On Fri, Oct 21, 2011 at 12:29, Koen Kooi <koen@dominion.thruhere.net> wrote:
...
> ln -s ${base_bindir}/systemd ${D}/init
>
> shall I fix it myself or do you want to send a patch?
If you can amend it and push better, so I just rebase it here and
avoid another pull request.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature
2011-10-21 14:04 ` Koen Kooi
@ 2011-10-21 15:56 ` Khem Raj
0 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2011-10-21 15:56 UTC (permalink / raw)
To: openembedded-devel
On Fri, Oct 21, 2011 at 7:04 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> As we discussed briefly on IRC, DISTRO_FEATURE or IMAGE_FEATURE might be
> better. So, what do others think?
>
I think IMAGE_FEATURE is appropriate here.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 0/5] SystemD fixes and improvements
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
` (4 preceding siblings ...)
2011-10-21 13:55 ` [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature Otavio Salvador
@ 2011-10-24 6:55 ` Koen Kooi
5 siblings, 0 replies; 11+ messages in thread
From: Koen Kooi @ 2011-10-24 6:55 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 21-10-11 15:55, Otavio Salvador schreef:
> The following changes since commit
> 36423031ae2cc2157232f3bec8f5c9fa53ef215d:
>
> Cloud9: incremental submodule and build fixes (2011-10-21 14:57:30
> +0200)
>
> are available in the git repository at:
> git://github.com/OSSystems/meta-oe master
> https://github.com/OSSystems/meta-oe/tree/master
>
> Otavio Salvador (5): systemd-serialgetty: don't require systemd_git.bb
> systemd: add systemd-initramfs
These 2 have been merged
> systemd: add lock group using useradd.bbclass
This one is waiting for the matching useradd fix to go in to oe-core
> systemd: do not recommend systemd-serialgetty task-basic: add
> "serial-console" machine feature
I'd like some more feedback on this from the oe-core people, since we're
adding a new MACHINE/DISTRO/IMAGE_FEATURE.
I'll be at ELC-E in Prague this week with other OE developers, so the
patchflow will slow down.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFOpQvqMkyGM64RGpERAmCzAKCancsMz7U/YndZn2Gc2WLzJHnVxACfcbBk
tb1bywVIb3azG5MC90B9PX0=
=licP
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-10-24 7:01 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-21 13:55 [meta-oe][PATCH 0/5] SystemD fixes and improvements Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 1/5] systemd-serialgetty: don't require systemd_git.bb Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 2/5] systemd: add systemd-initramfs Otavio Salvador
2011-10-21 14:29 ` Koen Kooi
2011-10-21 14:38 ` Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 3/5] systemd: add lock group using useradd.bbclass Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 4/5] systemd: do not recommend systemd-serialgetty Otavio Salvador
2011-10-21 13:55 ` [meta-oe][PATCH 5/5] task-basic: add "serial-console" machine feature Otavio Salvador
2011-10-21 14:04 ` Koen Kooi
2011-10-21 15:56 ` Khem Raj
2011-10-24 6:55 ` [meta-oe][PATCH 0/5] SystemD fixes and improvements Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox