mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 17:19:23 +00:00
Code Issues Projects Releases Wiki Activity

systemd: bump SRCREV to fix capability dropping on older (<.39) kernels

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-06-28 14:51:16 +02:00
parent 84197dc0c2
commit 705e4e484f
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/systemd/systemd_git.bb
+12 -4
View File
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "acl readline udev dbus libcap2 libcgroup" DEPENDS = "acl readline udev dbus libcap libcgroup"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SERIAL_CONSOLE ?= "115200 /dev/ttyS0" SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
@@ -15,11 +15,11 @@ inherit gitpkgv
PKGV = "v${GITPKGVTAG}" PKGV = "v${GITPKGVTAG}"
PV = "git" PV = "git"
PR = "r0" PR = "r2"
inherit autotools vala inherit autotools vala
SRCREV = "cd58752a158ccab3db77d355410b31b457df4cfc" SRCREV = "ae556c210942cb6986c6d77b58505b5daa66bbe2"
SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \ file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
@@ -44,7 +44,9 @@ def get_baudrate(bb, d):
def get_console(bb, d): def get_console(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1] return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1]
do_install_append() { do_install() {
autotools_do_install
if [ ! ${@get_baudrate(bb, d)} = "" ]; then if [ ! ${@get_baudrate(bb, d)} = "" ]; then
sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service
install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/ install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/
@@ -53,6 +55,12 @@ do_install_append() {
fi fi
} }
# 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
rm -f ${D}${base_libdir}/systemd/system/*/*hugepages.mount
}
PACKAGES =+ "${PN}-gui ${PN}-serialgetty" PACKAGES =+ "${PN}-gui ${PN}-serialgetty"
FILES_${PN}-gui = "${bindir}/systemadm" FILES_${PN}-gui = "${bindir}/systemadm"