mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 20:56:55 +00:00
systemd: update to systemd-191
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
f8fedaec42
commit
d5084b220d
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="systemd"
|
PKG_NAME="systemd"
|
||||||
PKG_VERSION="189"
|
PKG_VERSION="191"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
Without this, build fail if we --disable-xz or does not have xz installed in
|
|
||||||
system.
|
|
||||||
|
|
||||||
Signed-off-by: Yin Kangkai <kangkai.yin at intel.com>
|
|
||||||
---
|
|
||||||
src/journal/journal-verify.c | 4 ++++
|
|
||||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
|
|
||||||
index 2401293..5d134bd 100644
|
|
||||||
--- a/src/journal/journal-verify.c
|
|
||||||
+++ b/src/journal/journal-verify.c
|
|
||||||
@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
|
|
||||||
h1 = le64toh(o->data.hash);
|
|
||||||
|
|
||||||
if (o->object.flags & OBJECT_COMPRESSED) {
|
|
||||||
+#ifdef HAVE_XZ
|
|
||||||
void *b = NULL;
|
|
||||||
uint64_t alloc = 0, b_size;
|
|
||||||
|
|
||||||
@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) {
|
|
||||||
|
|
||||||
h2 = hash64(b, b_size);
|
|
||||||
free(b);
|
|
||||||
+#else
|
|
||||||
+ return -EPROTONOSUPPORT;
|
|
||||||
+#endif
|
|
||||||
} else
|
|
||||||
h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.3.4
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
|||||||
From: Allin Cottrell <cottrell@wfu.edu>
|
|
||||||
Date: Thu, 23 Aug 2012 23:46:38 +0000
|
|
||||||
Subject: journald: add missing includes
|
|
||||||
|
|
||||||
---
|
|
||||||
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
|
|
||||||
index 6cd2397..2596d44 100644
|
|
||||||
--- a/src/journal/journald-console.c
|
|
||||||
+++ b/src/journal/journald-console.c
|
|
||||||
@@ -21,6 +21,7 @@
|
|
||||||
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <sys/socket.h>
|
|
||||||
|
|
||||||
#include "journald.h"
|
|
||||||
#include "journald-console.h"
|
|
||||||
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
|
|
||||||
index 2f83cbd..32474df 100644
|
|
||||||
--- a/src/journal/journald-gperf.gperf
|
|
||||||
+++ b/src/journal/journald-gperf.gperf
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
%{
|
|
||||||
#include <stddef.h>
|
|
||||||
+#include <sys/socket.h>
|
|
||||||
#include "conf-parser.h"
|
|
||||||
#include "journald.h"
|
|
||||||
%}
|
|
||||||
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
|
|
||||||
index aebca5d..b259480 100644
|
|
||||||
--- a/src/journal/journald-kmsg.c
|
|
||||||
+++ b/src/journal/journald-kmsg.c
|
|
||||||
@@ -23,6 +23,7 @@
|
|
||||||
#include <sys/epoll.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <sys/mman.h>
|
|
||||||
+#include <sys/socket.h>
|
|
||||||
|
|
||||||
#include <systemd/sd-messages.h>
|
|
||||||
#include <libudev.h>
|
|
||||||
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
|
|
||||||
index 7aa99a3..4e44c3a 100644
|
|
||||||
--- a/src/journal/journald-native.c
|
|
||||||
+++ b/src/journal/journald-native.c
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
***/
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <stddef.h>
|
|
||||||
#include <sys/epoll.h>
|
|
||||||
|
|
||||||
#include "socket-util.h"
|
|
||||||
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
|
|
||||||
index 3e4022a..113c421 100644
|
|
||||||
--- a/src/journal/journald-stream.c
|
|
||||||
+++ b/src/journal/journald-stream.c
|
|
||||||
@@ -21,6 +21,7 @@
|
|
||||||
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <stddef.h>
|
|
||||||
#include <sys/epoll.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
|
|
||||||
index daed095..9db9198 100644
|
|
||||||
--- a/src/journal/journald-syslog.c
|
|
||||||
+++ b/src/journal/journald-syslog.c
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
***/
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <stddef.h>
|
|
||||||
#include <sys/epoll.h>
|
|
||||||
|
|
||||||
#include "socket-util.h"
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2-2-gbebe
|
|
Loading…
x
Reference in New Issue
Block a user