[OE-core] [PATCH 18/42] systemd-serialgetty: Fix usage of systemd unitdir vars

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-core/systemd/systemd-serialgetty.bb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb 
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 768b130..b57f0f3 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -13,10 +13,10 @@ S = "${WORKDIR}"
 do_install() {
        if [ ! -z "${SERIAL_CONSOLES}" ] ; then
                default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
-               install -d ${D}${systemd_unitdir}/system/
+               install -d ${D}${systemd_system_unitdir}/
                install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
-               install -m 0644 ${WORKDIR}/serial-getty@.service 
${D}${systemd_unitdir}/system/
-               sed -i -e s/\@BAUDRATE\@/$default_baudrate/g 
${D}${systemd_unitdir}/system/serial-getty@.service
+               install -m 0644 ${WORKDIR}/serial-getty@.service 
${D}${systemd_system_unitdir}/
+               sed -i -e s/\@BAUDRATE\@/$default_baudrate/g 
${D}${systemd_system_unitdir}/serial-getty@.service
 
                tmp="${SERIAL_CONSOLES}"
                for entry in $tmp ; do
@@ -24,14 +24,14 @@ do_install() {
                        ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 
's/\;.*//'`
                        if [ "$baudrate" = "$default_baudrate" ] ; then
                                # enable the service
-                               ln -sf 
${systemd_unitdir}/system/serial-getty@.service \
+                               ln -sf 
${systemd_system_unitdir}/serial-getty@.service \
                                        
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service
                        else
                                # install custom service file for the 
non-default baudrate
-                               install -m 0644 
${WORKDIR}/serial-getty@.service 
${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
-                               sed -i -e s/\@BAUDRATE\@/$baudrate/g 
${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
+                               install -m 0644 
${WORKDIR}/serial-getty@.service 
${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
+                               sed -i -e s/\@BAUDRATE\@/$baudrate/g 
${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
                                # enable the service
-                               ln -sf 
${systemd_unitdir}/system/serial-getty$baudrate@.service \
+                               ln -sf 
${systemd_system_unitdir}/serial-getty$baudrate@.service \
                                        
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service
                        fi
                done
@@ -41,7 +41,7 @@ do_install() {
 RDEPENDS_${PN} = "systemd"
 
 # This is a machine specific file
-FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
+FILES_${PN} = "${systemd_system_unitdir}/*.service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # As this package is tied to systemd, only build it when we're also building 
systemd.
-- 
2.7.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core