summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-04-04 15:41:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 14:33:58 +0100
commitf2d5e20153e001cde257544e5e43998315656bbf (patch)
tree0145889b16550bb8f363d3858bb15d0b24e5a4f6
parente699404f73120d2b0111721409dcfd6311746cb3 (diff)
downloadpoky-f2d5e20153e001cde257544e5e43998315656bbf.tar.gz
systemd: make systemd-serialgetty optional
Some distros may prefer to use the upstream systemd support for starting getty on serial ports. This is now possible by adding "serial-getty-generator" to PACKAGECONFIG. The default is unchanged, i.e. systemd's own serial-getty@.service file does not get packaged and instead systemd-serialgetty is pulled into images via RRECOMMENDS. (From OE-Core rev: 2a8d0df47c9d28f8ca7285861dee7a178273eae4) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_229.bb14
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb
index 309a4c3a08..c23c749e2a 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -96,6 +96,11 @@ PACKAGECONFIG ??= "xz \
96PACKAGECONFIG_remove_libc-musl = "selinux" 96PACKAGECONFIG_remove_libc-musl = "selinux"
97PACKAGECONFIG_remove_libc-musl = "smack" 97PACKAGECONFIG_remove_libc-musl = "smack"
98 98
99# Use the upstream systemd serial-getty@.service and rely on
100# systemd-getty-generator instead of using the OE-core specific
101# systemd-serialgetty.bb - not enabled by default.
102PACKAGECONFIG[serial-getty-generator] = ""
103
99PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 104PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
100# Sign the journal for anti-tampering 105# Sign the journal for anti-tampering
101PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" 106PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
@@ -204,8 +209,10 @@ do_configure_prepend() {
204do_install() { 209do_install() {
205 autotools_do_install 210 autotools_do_install
206 install -d ${D}/${base_sbindir} 211 install -d ${D}/${base_sbindir}
207 # Provided by a separate recipe 212 if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then
208 rm ${D}${systemd_unitdir}/system/serial-getty* -f 213 # Provided by a separate recipe
214 rm ${D}${systemd_unitdir}/system/serial-getty* -f
215 fi
209 216
210 # Provide support for initramfs 217 # Provide support for initramfs
211 [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init 218 [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
@@ -455,7 +462,8 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $
455RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" 462RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})"
456RDEPENDS_${PN} += "volatile-binds update-rc.d" 463RDEPENDS_${PN} += "volatile-binds update-rc.d"
457 464
458RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ 465RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)} \
466 systemd-vconsole-setup \
459 systemd-extra-utils \ 467 systemd-extra-utils \
460 systemd-compat-units udev-hwdb \ 468 systemd-compat-units udev-hwdb \
461 util-linux-agetty util-linux-fsck e2fsprogs-e2fsck \ 469 util-linux-agetty util-linux-fsck e2fsprogs-e2fsck \