jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to systemd-227

Browse Source
This commit is contained in:
Lukas Rusak 2015-05-22 12:28:24 -07:00 committed by Stephan Raue
parent 3117cc51af
commit 32745c1f7f
8 changed files with 77 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/sysutils/systemd/package.mk
View File

@ -17,12 +17,12 @@
################################################################################
PKG_NAME="systemd"
PKG_VERSION="219"
PKG_VERSION="227"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="https://github.com/systemd/systemd/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux"
PKG_PRIORITY="required"
PKG_SECTION="system"
@ -35,13 +35,10 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
ac_cv_have_decl_IFLA_BOND_AD_INFO=no \
ac_cv_have_decl_IFLA_BRPORT_UNICAST_FLOOD=no \
ac_cv_path_MOUNT_PATH="/bin/mount"
ac_cv_path_UMOUNT_PATH="/bin/umount"
KMOD=/usr/bin/kmod \
--disable-nls \
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
--disable-python-devel \
--disable-python-devel \
--disable-dbus \
--disable-utmp \
--disable-compat-libs \
@ -51,7 +48,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--enable-blkid \
--disable-seccomp \
--disable-ima \
--disable-chkconfig \
--disable-selinux \
--disable-apparmor \
--disable-xz \
@ -93,10 +89,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--disable-resolved \
--disable-networkd \
--disable-efi \
--disable-terminal \
--disable-gnuefi \
--disable-kdbus \
--disable-myhostname \
--disable-gudev \
--enable-hwdb \
--disable-manpages \
--disable-hibernate \
@ -114,15 +109,28 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--with-rootprefix=/usr \
--with-rootlibdir=/lib"
unpack() {
tar xf $ROOT/$SOURCES/systemd/v$PKG_VERSION.tar.gz -C $ROOT/$BUILD
}
pre_build_target() {
# broken autoreconf
( cd $PKG_BUILD
intltoolize --force
)
}
post_makeinstall_target() {
# remove unneeded stuff
rm -rf $INSTALL/etc/systemd/system
rm -rf $INSTALL/etc/xdg
rm -rf $INSTALL/etc/X11
rm -f $INSTALL/usr/bin/kernel-install
rm -rf $INSTALL/usr/lib/kernel/install.d
rm -rf $INSTALL/usr/lib/rpm
rm -rf $INSTALL/usr/lib/systemd/user
rm -rf $INSTALL/usr/lib/tmpfiles.d/etc.conf
rm -rf $INSTALL/usr/lib/tmpfiles.d/home.conf
rm -rf $INSTALL/usr/share/factory
rm -rf $INSTALL/usr/share/zsh

22
packages/sysutils/systemd/patches/systemd-02_move-etc-systemd-system-to-storage-.config-system.d.patch
View File

@ -26,28 +26,6 @@ index bf04d31..36c269e 100644
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
- '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
+ '|SYSTEM_CONFIG_UNIT_PATH=/storage/.config/system.d|' \
'|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
'|pkgdatadir=$(pkgdatadir)|' \
'|systemunitdir=$(systemunitdir)|' \
diff --git a/Makefile.in b/Makefile.in
index 49f9f2b..1e68a20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5786,7 +5786,7 @@ PY_LOG_COMPILER = $(PYTHON)
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
+ -DSYSTEM_CONFIG_UNIT_PATH=\"/storage/.config/system.d\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
@@ -9524,7 +9524,7 @@ substitutions = \
'|SYSTEMCTL=$(rootbindir)/systemctl|' \
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
- '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
+ '|SYSTEM_CONFIG_UNIT_PATH=/storage/.config/system.d|' \
'|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
'|pkgdatadir=$(pkgdatadir)|' \

32
packages/sysutils/systemd/patches/systemd-03_move-hwdb.bin-to-run.patch
View File

@ -1,26 +1,40 @@
From b3f99f116ece09c991f1fe49070edf8b001a5486 Mon Sep 17 00:00:00 2001
From 73f401a5a33ad3e647791685a9af14e69c7a89f6 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 18 Feb 2015 18:21:36 +0200
Date: Fri, 7 Aug 2015 13:25:23 +0300
Subject: [PATCH 3/8] move hwdb.bin to /run
---
src/hwdb/hwdb.c | 2 +-
src/libsystemd/sd-hwdb/sd-hwdb.c | 2 +-
src/udev/udevadm-hwdb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 446de3a..be91bfe 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -38,7 +38,7 @@
* Uses a Patricia/radix trie to index all matches for efficient lookup.
*/
-static const char *arg_hwdb_bin_dir = "/etc/udev";
+static const char *arg_hwdb_bin_dir = "/run";
static const char *arg_root = "";
static const char * const conf_file_dirs[] = {
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index 61c7b44..6e1de7d 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -272,7 +272,7 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
@@ -269,7 +269,7 @@
static const char hwdb_bin_paths[] =
"/etc/systemd/hwdb/hwdb.bin\0"
- "/etc/udev/hwdb.bin\0"
+ "/run/hwdb.bin\0"
"/usr/lib/systemd/hwdb/hwdb.bin\0"
"/etc/systemd/hwdb/hwdb.bin\0"
- "/etc/udev/hwdb.bin\0"
+ "/run/hwdb.bin\0"
"/usr/lib/systemd/hwdb/hwdb.bin\0"
#ifdef HAVE_SPLIT_USR
"/lib/systemd/hwdb/hwdb.bin\0"
"/lib/systemd/hwdb/hwdb.bin\0"
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index d65e40c..8889df7 100644
--- a/src/udev/udevadm-hwdb.c

31
packages/sysutils/systemd/patches/systemd-05_autoreconf-remove-gcrypt-dependency.patch
View File

@ -1,31 +0,0 @@
From dd5204794a1f2ca1924a64d527b39a254a469200 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 28 Jul 2014 21:22:10 +0300
Subject: [PATCH 5/8] autoreconf: remove gcrypt dependency
---
configure.ac | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index c9d3305..0682845 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,13 +716,7 @@ AC_ARG_ENABLE([gcrypt],
[have_gcrypt=auto])
if test "x${have_gcrypt}" != xno ; then
- AM_PATH_LIBGCRYPT(
- [1.4.5],
- [have_gcrypt=yes],
- [if test "x$have_gcrypt" = xyes ; then
- AC_MSG_ERROR([*** GCRYPT headers not found.])
- fi])
-
+ have_gcrypt=no
if test "x$have_gcrypt" = xyes ; then
GCRYPT_LIBS="$LIBGCRYPT_LIBS"
GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
--
1.7.10.4

72
packages/sysutils/systemd/patches/systemd-08_systemctl-disable-dangerous-options.patch
View File

@ -1,17 +1,17 @@
From 719c4c427f7dae08658cff066468712c35744343 Mon Sep 17 00:00:00 2001
From 746a11e5938bad3865c6d03fbed3ea6dfc583fb1 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 11 Dec 2014 21:36:36 +0200
Date: Thu, 8 Oct 2015 11:59:39 +0300
Subject: [PATCH 8/8] systemctl: disable dangerous options
---
src/systemctl/systemctl.c | 25 +++++++++++++++----------
src/systemctl/systemctl.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 21cb898..9db08ad 100644
index 420a246..06bca92 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6019,6 +6019,11 @@ end:
@@ -6257,6 +6257,11 @@ end:
return r;
}
@ -23,38 +23,38 @@ index 21cb898..9db08ad 100644
static void systemctl_help(void) {
pager_open_if_enabled();
@@ -7112,21 +7117,21 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) {
{ "enable", MORE, 2, enable_unit, NOBUS },
{ "disable", MORE, 2, enable_unit, NOBUS },
{ "is-enabled", MORE, 2, unit_is_enabled, NOBUS },
- { "reenable", MORE, 2, enable_unit, NOBUS },
- { "preset", MORE, 2, enable_unit, NOBUS },
- { "preset-all", EQUAL, 1, preset_all, NOBUS },
- { "mask", MORE, 2, enable_unit, NOBUS },
- { "unmask", MORE, 2, enable_unit, NOBUS },
- { "link", MORE, 2, enable_unit, NOBUS },
+ { "reenable", MORE, 2, nope, NOBUS },
+ { "preset", MORE, 2, nope, NOBUS },
+ { "preset-all", EQUAL, 1, nope, NOBUS },
+ { "mask", MORE, 2, nope, NOBUS },
+ { "unmask", MORE, 2, nope, NOBUS },
+ { "link", MORE, 2, nope, NOBUS },
{ "switch-root", MORE, 2, switch_root },
{ "list-dependencies", LESS, 2, list_dependencies },
- { "set-default", EQUAL, 2, set_default, NOBUS },
+ { "set-default", EQUAL, 2, nope, NOBUS },
{ "get-default", EQUAL, 1, get_default, NOBUS },
{ "set-property", MORE, 3, set_property },
{ "is-system-running", EQUAL, 1, is_system_running },
- { "add-wants", MORE, 3, add_dependency, NOBUS },
- { "add-requires", MORE, 3, add_dependency, NOBUS },
- { "edit", MORE, 2, edit, NOBUS },
+ { "add-wants", MORE, 3, nope, NOBUS },
+ { "add-requires", MORE, 3, nope, NOBUS },
+ { "edit", MORE, 2, nope, NOBUS },
@@ -7450,21 +7455,21 @@ static int systemctl_main(int argc, char *argv[]) {
{ "enable", 2, VERB_ANY, 0, enable_unit },
{ "disable", 2, VERB_ANY, 0, enable_unit },
{ "is-enabled", 2, VERB_ANY, 0, unit_is_enabled },
- { "reenable", 2, VERB_ANY, 0, enable_unit },
- { "preset", 2, VERB_ANY, 0, enable_unit },
- { "preset-all", VERB_ANY, 1, 0, preset_all },
- { "mask", 2, VERB_ANY, 0, enable_unit },
- { "unmask", 2, VERB_ANY, 0, enable_unit },
- { "link", 2, VERB_ANY, 0, enable_unit },
+ { "reenable", 2, VERB_ANY, 0, nope },
+ { "preset", 2, VERB_ANY, 0, nope },
+ { "preset-all", VERB_ANY, 1, 0, nope },
+ { "mask", 2, VERB_ANY, 0, nope },
+ { "unmask", 2, VERB_ANY, 0, nope },
+ { "link", 2, VERB_ANY, 0, nope },
{ "switch-root", 2, VERB_ANY, 0, switch_root },
{ "list-dependencies", VERB_ANY, 2, 0, list_dependencies },
- { "set-default", 2, 2, 0, set_default },
+ { "set-default", 2, 2, 0, nope },
{ "get-default", VERB_ANY, 1, 0, get_default, },
{ "set-property", 3, VERB_ANY, 0, set_property },
{ "is-system-running", VERB_ANY, 1, 0, is_system_running },
- { "add-wants", 3, VERB_ANY, 0, add_dependency },
- { "add-requires", 3, VERB_ANY, 0, add_dependency },
- { "edit", 2, VERB_ANY, 0, edit },
+ { "add-wants", 3, VERB_ANY, 0, nope },
+ { "add-requires", 3, VERB_ANY, 0, nope },
+ { "edit", 2, VERB_ANY, 0, nope },
{}
}, *verb = verbs;
};
--
1.7.10.4
2.1.4

11
packages/sysutils/systemd/patches/systemd-09_socket.h.patch
View File

@ -1,11 +0,0 @@
diff -Naur systemd-209/src/shared/missing.h systemd-209.patch/src/shared/missing.h
--- systemd-209/src/shared/missing.h 2014-02-19 16:23:43.000000000 +0100
+++ systemd-209.patch/src/shared/missing.h 2014-02-21 03:45:26.766549911 +0100
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <linux/oom.h>
#include <linux/input.h>
+#include <sys/socket.h>
#include <linux/if_link.h>
#ifdef HAVE_AUDIT

32
packages/sysutils/systemd/patches/systemd-99.01-upstream.patch
View File

@ -1,32 +0,0 @@
From 65eae3b76243d2dfd869f8c43b787575f7b4b994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sun, 1 Mar 2015 21:13:10 -0300
Subject: journal: fix Inappropriate ioctl for device on ext4
Logs constantly show
systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device
This is because ext4 does not support FS_NOCOW_FL.
[zj: fold into one conditional as suggested on the ML and
fix (preexisting) r/errno confusion in error message.]
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 9c9a548..0e33a0f 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2609,8 +2609,8 @@ int journal_file_open(
* shouldn't be too bad, given that we do our own
* checksumming). */
r = chattr_fd(f->fd, true, FS_NOCOW_FL);
- if (r < 0)
- log_warning_errno(errno, "Failed to set file attributes: %m");
+ if (r < 0 && r != -ENOTTY)
+ log_warning_errno(r, "Failed to set file attributes: %m");
/* Let's attach the creation time to the journal file,
* so that the vacuuming code knows the age of this
--
cgit v0.10.2

12
packages/sysutils/systemd/patches/systemd-99.02-RH1196417-revert-06e9788.patch
View File

@ -1,12 +0,0 @@
diff -Naur systemd-219/src/core/mount.c systemd-219.patch/src/core/mount.c
--- systemd-219/src/core/mount.c 2015-02-03 02:00:06.169044215 +0100
+++ systemd-219.patch/src/core/mount.c 2015-03-05 21:50:04.567090596 +0100
@@ -300,7 +300,7 @@
assert(m);
- p = get_mount_parameters(m);
+ p = get_mount_parameters_fragment(m);
if (!p)
return 0;