diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-28 14:51:16 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-28 14:57:03 +0200 |
commit | 705e4e484f69dca56db5728e7fb1f14de95fc183 (patch) | |
tree | 30426d7460c9ea3d249a5a453a7e43fd18fae262 | |
parent | 84197dc0c205d0fdfc4c4a39f99f574f34ef0078 (diff) | |
download | meta-openembedded-705e4e484f69dca56db5728e7fb1f14de95fc183.tar.gz |
systemd: bump SRCREV to fix capability dropping on older (<.39) kernels
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | meta-oe/recipes-core/systemd/systemd_git.bb | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index 4cc313483f..dff299ee03 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" | |||
3 | LICENSE = "GPLv2+" | 3 | LICENSE = "GPLv2+" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" |
5 | 5 | ||
6 | DEPENDS = "acl readline udev dbus libcap2 libcgroup" | 6 | DEPENDS = "acl readline udev dbus libcap libcgroup" |
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
8 | 8 | ||
9 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" | 9 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" |
@@ -15,11 +15,11 @@ inherit gitpkgv | |||
15 | PKGV = "v${GITPKGVTAG}" | 15 | PKGV = "v${GITPKGVTAG}" |
16 | 16 | ||
17 | PV = "git" | 17 | PV = "git" |
18 | PR = "r0" | 18 | PR = "r2" |
19 | 19 | ||
20 | inherit autotools vala | 20 | inherit autotools vala |
21 | 21 | ||
22 | SRCREV = "cd58752a158ccab3db77d355410b31b457df4cfc" | 22 | SRCREV = "ae556c210942cb6986c6d77b58505b5daa66bbe2" |
23 | 23 | ||
24 | SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ | 24 | SRC_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 \ |
@@ -44,13 +44,21 @@ def get_baudrate(bb, d): | |||
44 | def get_console(bb, d): | 44 | def get_console(bb, d): |
45 | return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1] | 45 | return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1] |
46 | 46 | ||
47 | do_install_append() { | 47 | do_install() { |
48 | if [ ! ${@get_baudrate(bb, d)} = "" ]; then | 48 | autotools_do_install |
49 | sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service | 49 | |
50 | install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/ | 50 | if [ ! ${@get_baudrate(bb, d)} = "" ]; then |
51 | ln -sf ${base_libdir}/systemd/system/serial-getty@.service \ | 51 | sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service |
52 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service | 52 | install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/ |
53 | fi | 53 | ln -sf ${base_libdir}/systemd/system/serial-getty@.service \ |
54 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service | ||
55 | fi | ||
56 | } | ||
57 | |||
58 | # ARM doesn't support hugepages, so don't try to mount them | ||
59 | do_install_append_arm() { | ||
60 | rm -f ${D}${base_libdir}/systemd/system/*hugepages.mount | ||
61 | rm -f ${D}${base_libdir}/systemd/system/*/*hugepages.mount | ||
54 | } | 62 | } |
55 | 63 | ||
56 | PACKAGES =+ "${PN}-gui ${PN}-serialgetty" | 64 | PACKAGES =+ "${PN}-gui ${PN}-serialgetty" |