jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 21:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: update to 232

Browse Source
This commit is contained in:
Lukas Rusak 2016-11-22 23:31:14 -08:00
parent 20d72172fb
commit b12be93217
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
4 changed files with 77 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="systemd" PKG_NAME="systemd"
PKG_VERSION="230" PKG_VERSION="232"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -103,7 +103,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--with-dbussessionservicedir=/usr/share/dbus-1/services \ --with-dbussessionservicedir=/usr/share/dbus-1/services \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
--with-rootprefix=/usr \ --with-rootprefix=/usr \
--with-rootlibdir=/lib" --with-rootlibdir=/usr/lib"
pre_build_target() { pre_build_target() {
# broken autoreconf # broken autoreconf

84
packages/sysutils/systemd/patches/systemd-0004-systemctl-disable-dangerous-options.patch
View File

@ -1,18 +1,15 @@
From 746a11e5938bad3865c6d03fbed3ea6dfc583fb1 Mon Sep 17 00:00:00 2001 commit e24e9fabeb4f91d1dc428d06e2a144bccd7538eb
From: Stefan Saraev <stefan@saraev.ca> Author: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 8 Oct 2015 11:59:39 +0300 Date: Tue Nov 22 23:23:19 2016 -0800
Subject: [PATCH 8/8] systemctl: disable dangerous options
--- systemctl: disable dangerous options
src/systemctl/systemctl.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 420a246..06bca92 100644 index dd3b931..6f8290d 100644
--- a/src/systemctl/systemctl.c --- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c
@@ -6257,6 +6257,11 @@ end: @@ -8009,6 +8009,11 @@ static int talk_initctl(void) {
return r; #endif
} }
+static int nope(sd_bus *bus, char **args) { +static int nope(sd_bus *bus, char **args) {
@ -20,42 +17,39 @@ index 420a246..06bca92 100644
+ return 0; + return 0;
+} +}
+ +
static void systemctl_help(void) { static int systemctl_main(int argc, char *argv[]) {
pager_open_if_enabled(); static const Verb verbs[] = {
@@ -7370,22 +7370,22 @@ @@ -8062,22 +8067,22 @@ static int systemctl_main(int argc, char *argv[]) {
{ "enable", 2, VERB_ANY, 0, enable_unit }, { "enable", 2, VERB_ANY, 0, enable_unit },
{ "disable", 2, VERB_ANY, 0, enable_unit }, { "disable", 2, VERB_ANY, 0, enable_unit },
{ "is-enabled", 2, VERB_ANY, 0, unit_is_enabled }, { "is-enabled", 2, VERB_ANY, 0, unit_is_enabled },
- { "reenable", 2, VERB_ANY, 0, enable_unit }, - { "reenable", 2, VERB_ANY, 0, enable_unit },
- { "preset", 2, VERB_ANY, 0, enable_unit }, - { "preset", 2, VERB_ANY, 0, enable_unit },
- { "preset-all", VERB_ANY, 1, 0, preset_all }, - { "preset-all", VERB_ANY, 1, 0, preset_all },
- { "mask", 2, VERB_ANY, 0, enable_unit }, - { "mask", 2, VERB_ANY, 0, enable_unit },
- { "unmask", 2, VERB_ANY, 0, enable_unit }, - { "unmask", 2, VERB_ANY, 0, enable_unit },
- { "link", 2, VERB_ANY, 0, enable_unit }, - { "link", 2, VERB_ANY, 0, enable_unit },
+ { "reenable", 2, VERB_ANY, 0, nope }, + { "reenable", 2, VERB_ANY, 0, nope },
+ { "preset", 2, VERB_ANY, 0, nope }, + { "preset", 2, VERB_ANY, 0, nope },
+ { "preset-all", VERB_ANY, 1, 0, nope }, + { "preset-all", VERB_ANY, 1, 0, nope },
+ { "mask", 2, VERB_ANY, 0, nope }, + { "mask", 2, VERB_ANY, 0, nope },
+ { "unmask", 2, VERB_ANY, 0, nope }, + { "unmask", 2, VERB_ANY, 0, nope },
+ { "link", 2, VERB_ANY, 0, nope }, + { "link", 2, VERB_ANY, 0, nope },
{ "revert", 2, VERB_ANY, 0, enable_unit }, { "revert", 2, VERB_ANY, 0, enable_unit },
{ "switch-root", 2, VERB_ANY, VERB_NOCHROOT, switch_root }, { "switch-root", 2, VERB_ANY, VERB_NOCHROOT, switch_root },
{ "list-dependencies", VERB_ANY, 2, VERB_NOCHROOT, list_dependencies }, { "list-dependencies", VERB_ANY, 2, VERB_NOCHROOT, list_dependencies },
- { "set-default", 2, 2, 0, set_default }, - { "set-default", 2, 2, 0, set_default },
+ { "set-default", 2, 2, 0, nope }, + { "set-default", 2, 2, 0, nope },
{ "get-default", VERB_ANY, 1, 0, get_default, }, { "get-default", VERB_ANY, 1, 0, get_default },
{ "set-property", 3, VERB_ANY, VERB_NOCHROOT, set_property }, { "set-property", 3, VERB_ANY, VERB_NOCHROOT, set_property },
{ "is-system-running", VERB_ANY, 1, 0, is_system_running }, { "is-system-running", VERB_ANY, 1, 0, is_system_running },
- { "add-wants", 3, VERB_ANY, 0, add_dependency }, - { "add-wants", 3, VERB_ANY, 0, add_dependency },
- { "add-requires", 3, VERB_ANY, 0, add_dependency }, - { "add-requires", 3, VERB_ANY, 0, add_dependency },
- { "edit", 2, VERB_ANY, VERB_NOCHROOT, edit }, - { "edit", 2, VERB_ANY, VERB_NOCHROOT, edit },
+ { "add-wants", 3, VERB_ANY, 0, nope }, + { "add-wants", 3, VERB_ANY, 0, nope },
+ { "add-requires", 3, VERB_ANY, 0, nope }, + { "add-requires", 3, VERB_ANY, 0, nope },
+ { "edit", 2, VERB_ANY, 0, nope }, + { "edit", 2, VERB_ANY, VERB_NOCHROOT, nope },
{} {}
}; };
--
2.1.4

36
packages/sysutils/systemd/patches/systemd-0006-dont-use-the-unified-hierarchy-for-cgroups-yet.patch Normal file
View File

@ -0,0 +1,36 @@
From e3d9d7d770e4d7b61ad3b4c156e0d30894c30aac Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Wed, 9 Nov 2016 08:43:57 +0100
Subject: [PATCH] core: don't use the unified hierarchy for the systemd cgroup
yet
Too many things don't get along with the unified hierarchy yet:
* https://github.com/opencontainers/runc/issues/1175
* https://github.com/docker/docker/issues/28109
* https://github.com/lxc/lxc/issues/1280
So revert the default to the legacy hierarchy for now. Developers of the above
software can opt into the unified hierarchy with
"systemd.legacy_systemd_cgroup_controller=0".
---
src/basic/cgroup-util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 5e73753..dc13025 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2423,10 +2423,10 @@ bool cg_is_unified_systemd_controller_wanted(void) {
r = get_proc_cmdline_key("systemd.legacy_systemd_cgroup_controller=", &value);
if (r < 0)
- return true;
+ return false;
if (r == 0)
- wanted = true;
+ wanted = false;
else
wanted = parse_boolean(value) <= 0;
}

63
packages/sysutils/systemd/patches/systemd-04_nah.-no-ln-relative.patch
View File

@ -1,63 +0,0 @@
From cf364a6bd2efb460f92e1f073be00fc22c73f03e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 18 Feb 2015 18:22:32 +0200
Subject: [PATCH 4/8] nah. no ln --relative
pure ****
---
Makefile.am | 10 +++++-----
configure.ac | 2 --
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 36c269e..a2c2870 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,8 +233,8 @@ define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- rm -f $(DESTDIR)$(libdir)/$$libname && \
- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+ $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
@@ -297,9 +297,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
- dir=$(userunitdir) && $(install-relative-aliases)
+ dir=$(userunitdir) && $(install-aliases)
set -- $(GENERAL_ALIASES) && \
- dir= && $(install-relative-aliases)
+ dir= && $(install-aliases)
define install-aliases
while [ -n "$$1" ]; do \
@@ -2536,7 +2536,7 @@ systemd_dbus1_generator_LDADD = \
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
$(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+ $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
diff --git a/configure.ac b/configure.ac
index 97a29d6..c9d3305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,8 +100,6 @@ AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
-
M4_DEFINES=
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
--
1.7.10.4