[oe-commits] Koen Kooi : systemd: clean up serial port handling some more and fix the screen clearing problem

[git version control]

Module: meta-openembedded.git
Branch: master
Commit: 56485baea55de18ab22ca82ebaebdbfed1b353bc
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=56485baea55de18ab22ca82ebaebdbfed1b353bc

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Thu Jun 30 00:27:54 2011 +0200

systemd: clean up serial port handling some more and fix the screen clearing problem

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../recipes-core/systemd/systemd-serialgetty.bb    |    4 ++--
 meta-oe/recipes-core/systemd/systemd_git.bb        |   10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
index acc6768..d7e8571 100644
--- a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
@@ -32,12 +32,12 @@ do_install() {
 		fi
 }
 
-PACKAGES = "{$PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
 
 RRECOMMENDS_${PN} = ""
 RDEPENDS_${PN} = "systemd"
 
 # This is a machine specific file
-FILES_${PN} = "${base_libdir}/systemd/system/serial-getty at .service ${sysconfdir}/systemd/system/getty.target.wants/getty@${@get_console(bb, d)}.service"
+FILES_${PN} = "${base_libdir}/systemd/system/serial-getty at .service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 465a7f6..2a313e0 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -15,11 +15,11 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r2"
+PR = "r3"
 
 inherit autotools vala
 
-SRCREV = "ae556c210942cb6986c6d77b58505b5daa66bbe2"
+SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
            file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
@@ -37,6 +37,12 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
                  --disable-gtk \
                "
 
+do_install() {
+	autotools_do_install
+	# provided by a seperate recipe
+	rm ${D}${base_libdir}/systemd/system/serial-getty* -f
+}
+
 # ARM doesn't support hugepages, so don't try to mount them
 do_install_append_arm() {
 	rm -f ${D}${base_libdir}/systemd/system/*hugepages.mount