systemd: update to v216
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
Upstream-Status: Inappropriate [uclibc specific]
|
||||
|
||||
From 7be9273548bcb1f57d011fc252965e45dd2a058c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 21 Aug 2013 19:09:27 -0700
|
||||
Subject: [PATCH] uClibc doesn't implement pwritev/preadv
|
||||
|
||||
Lets stub out the testcase for building.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/libsystemd-bus/test-bus-memfd.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Index: systemd-209/src/libsystemd/sd-bus/test-bus-memfd.c
|
||||
===================================================================
|
||||
--- systemd-209.orig/src/libsystemd/sd-bus/test-bus-memfd.c 2014-02-19 15:03:09.983254602 -0800
|
||||
+++ systemd-209/src/libsystemd/sd-bus/test-bus-memfd.c 2014-02-19 23:42:10.636652864 -0800
|
||||
@@ -151,6 +151,7 @@
|
||||
/* check content */
|
||||
assert_se(memcmp(buf, "ll", 2) == 0);
|
||||
|
||||
+#ifndef __UCLIBC__
|
||||
/* writev it out*/
|
||||
iov[0].iov_base = (char *)"ABC";
|
||||
iov[0].iov_len = 3;
|
||||
@@ -173,6 +174,7 @@
|
||||
assert_se(memcmp(bufv[0], "ABC", 3) == 0);
|
||||
assert_se(memcmp(bufv[1], "DEF", 3) == 0);
|
||||
assert_se(memcmp(bufv[2], "GHI", 3) == 0);
|
||||
+#endif /* __UCLIBC__ */
|
||||
|
||||
sd_memfd_free(m);
|
||||
|
||||
@@ -17,9 +17,9 @@ SECTION = "base/shell"
|
||||
|
||||
inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
|
||||
|
||||
SRCREV = "cbfaff65cb086e3eb3709cf86dcf63b46622389b"
|
||||
SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b"
|
||||
|
||||
PV = "215+git${SRCPV}"
|
||||
PV = "216+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
|
||||
file://binfmt-install.patch \
|
||||
@@ -28,7 +28,6 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
|
||||
file://systemd-pam-fix-fallocate.patch \
|
||||
file://systemd-pam-fix-mkostemp.patch \
|
||||
file://optional_secure_getenv.patch \
|
||||
file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \
|
||||
file://uclibc-sysinfo_h.patch \
|
||||
file://uclibc-get-physmem.patch \
|
||||
file://0001-configure-disable-LTO.patch \
|
||||
@@ -210,6 +209,7 @@ FILES_${PN} = " ${base_bindir}/* \
|
||||
${datadir}/dbus-1/services \
|
||||
${datadir}/dbus-1/system-services \
|
||||
${datadir}/polkit-1 \
|
||||
${datadir}/factory \
|
||||
${datadir}/${BPN} \
|
||||
${sysconfdir}/bash_completion.d/ \
|
||||
${sysconfdir}/dbus-1/ \
|
||||
@@ -351,6 +351,28 @@ pkg_prerm_udev-hwdb () {
|
||||
rm -f ${sysconfdir}/udev/hwdb.bin
|
||||
}
|
||||
|
||||
# Do not activate libnss-resolve by default, that needs more thought
|
||||
|
||||
pkg_postinst_${PN} () {
|
||||
sed -e '/^hosts:/s/\s*\<myhostname\>//' \
|
||||
-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
|
||||
-i $D${sysconfdir}/nsswitch.conf
|
||||
|
||||
sed -e '/^hosts:/s/\s*\<mymachine\>//' \
|
||||
-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mymachine \3\4\5/' \
|
||||
-i $D${sysconfdir}/nsswitch.conf
|
||||
}
|
||||
|
||||
pkg_prerm_${PN} () {
|
||||
sed -e '/^hosts:/s/\s*\<myhostname\>//' \
|
||||
-e '/^hosts:/s/\s*myhostname//' \
|
||||
-i $D${sysconfdir}/nsswitch.conf
|
||||
|
||||
sed -e '/^hosts:/s/\s*\<mymachine\>//' \
|
||||
-e '/^hosts:/s/\s*mymachine//' \
|
||||
-i $D${sysconfdir}/nsswitch.conf
|
||||
}
|
||||
|
||||
# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
|
||||
# that we don't build both udev and systemd in world builds.
|
||||
python () {
|
||||
Reference in New Issue
Block a user