summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-07 14:29:37 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-07-09 11:35:36 +0200
commitb77b973a58d1edd6d077013f6e71268b2e9294f2 (patch)
treea86a2a2ad0bcdfdf0e7d20e8073078799b91f6fb
parent340cc366c7feff983a85f9e9ae8ae1f537239f5b (diff)
downloadmeta-openembedded-b77b973a58d1edd6d077013f6e71268b2e9294f2.tar.gz
systemd git: bump SRCREV to get a proper fix for the hugepages and mqueue issue
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-core/systemd/systemd_git.bb12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 40b93b8e59..66cc831f03 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
15PKGV = "v${GITPKGVTAG}" 15PKGV = "v${GITPKGVTAG}"
16 16
17PV = "git" 17PV = "git"
18PR = "r5" 18PR = "r7"
19 19
20inherit autotools vala 20inherit autotools vala
21 21
22SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" 22SRCREV = "ef3a24de028efe885db1303b4843aba5ffd0f531"
23 23
24SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ 24SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
25 file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ 25 file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
@@ -45,12 +45,6 @@ do_install() {
45 rm ${D}${base_libdir}/systemd/system/serial-getty* -f 45 rm ${D}${base_libdir}/systemd/system/serial-getty* -f
46} 46}
47 47
48# ARM doesn't support hugepages, so don't try to mount them
49do_install_append_arm() {
50 rm -f ${D}${base_libdir}/systemd/system/*hugepages.mount
51 rm -f ${D}${base_libdir}/systemd/system/*/*hugepages.mount
52}
53
54PACKAGES =+ "${PN}-gui" 48PACKAGES =+ "${PN}-gui"
55 49
56FILES_${PN}-gui = "${bindir}/systemadm" 50FILES_${PN}-gui = "${bindir}/systemadm"
@@ -79,9 +73,11 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
79# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack 73# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
80# of blacklist support, so use proper modprobe from module-init-tools 74# of blacklist support, so use proper modprobe from module-init-tools
81# And pull in the kernel modules mentioned in INSTALL 75# And pull in the kernel modules mentioned in INSTALL
76# swapon -p is also not supported by busybox
82RRECOMMENDS_${PN} += "kbd kbd-consolefonts \ 77RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
83 systemd-serialgetty \ 78 systemd-serialgetty \
84 util-linux-agetty \ 79 util-linux-agetty \
80 util-linux-swaponoff \
85 module-init-tools \ 81 module-init-tools \
86 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ 82 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
87" 83"