diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd-serialgetty.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 34defeb3b1..987a8bf89d 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | SUMMARY = "Serial terminal support for systemd" | 1 | SUMMARY = "Serial terminal support for systemd" |
2 | HOMEPAGE = "https://www.freedesktop.org/wiki/Software/systemd/" | 2 | HOMEPAGE = "https://www.freedesktop.org/wiki/Software/systemd/" |
3 | LICENSE = "GPLv2+" | 3 | LICENSE = "GPL-2.0-or-later" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |
5 | 5 | ||
6 | PR = "r5" | ||
7 | 6 | ||
8 | SERIAL_CONSOLES ?= "115200;ttyS0" | 7 | SERIAL_CONSOLES ?= "115200;ttyS0" |
9 | SERIAL_TERM ?= "linux" | 8 | SERIAL_TERM ?= "linux" |
@@ -14,16 +13,17 @@ S = "${WORKDIR}" | |||
14 | 13 | ||
15 | # As this package is tied to systemd, only build it when we're also building systemd. | 14 | # As this package is tied to systemd, only build it when we're also building systemd. |
16 | inherit features_check | 15 | inherit features_check |
17 | REQUIRED_DISTRO_FEATURES = "systemd" | 16 | REQUIRED_DISTRO_FEATURES += "systemd" |
17 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
18 | 18 | ||
19 | do_install() { | 19 | do_install() { |
20 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then | 20 | if [ ! -z "${SERIAL_CONSOLES}" ] ; then |
21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` | 21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` |
22 | install -d ${D}${systemd_unitdir}/system/ | 22 | install -d ${D}${systemd_system_unitdir}/ |
23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ | 23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ |
24 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/ | 24 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/ |
25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_unitdir}/system/serial-getty@.service | 25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_unitdir}/system/serial-getty@.service | 26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
27 | 27 | ||
28 | tmp="${SERIAL_CONSOLES}" | 28 | tmp="${SERIAL_CONSOLES}" |
29 | for entry in $tmp ; do | 29 | for entry in $tmp ; do |
@@ -31,14 +31,14 @@ do_install() { | |||
31 | ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'` | 31 | ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'` |
32 | if [ "$baudrate" = "$default_baudrate" ] ; then | 32 | if [ "$baudrate" = "$default_baudrate" ] ; then |
33 | # enable the service | 33 | # enable the service |
34 | ln -sf ${systemd_unitdir}/system/serial-getty@.service \ | 34 | ln -sf ${systemd_system_unitdir}/serial-getty@.service \ |
35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service | 35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service |
36 | else | 36 | else |
37 | # install custom service file for the non-default baudrate | 37 | # install custom service file for the non-default baudrate |
38 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service | 38 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service | 39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
40 | # enable the service | 40 | # enable the service |
41 | ln -sf ${systemd_unitdir}/system/serial-getty$baudrate@.service \ | 41 | ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \ |
42 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service | 42 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service |
43 | fi | 43 | fi |
44 | done | 44 | done |
@@ -46,7 +46,7 @@ do_install() { | |||
46 | } | 46 | } |
47 | 47 | ||
48 | # This is a machine specific file | 48 | # This is a machine specific file |
49 | FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" | 49 | FILES:${PN} = "${systemd_system_unitdir}/*.service ${sysconfdir}" |
50 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 50 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
51 | 51 | ||
52 | ALLOW_EMPTY_${PN} = "1" | 52 | ALLOW_EMPTY:${PN} = "1" |