diff options
Diffstat (limited to 'sys-apps/systemd/files')
| -rw-r--r-- | sys-apps/systemd/files/239-debug-extra.patch | 40 | ||||
| -rw-r--r-- | sys-apps/systemd/files/gentoo-generator-path.patch | 27 |
2 files changed, 0 insertions, 67 deletions
diff --git a/sys-apps/systemd/files/239-debug-extra.patch b/sys-apps/systemd/files/239-debug-extra.patch deleted file mode 100644 index 19db590257cf..000000000000 --- a/sys-apps/systemd/files/239-debug-extra.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Sun, 19 Aug 2018 19:11:30 +0200 -Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra - -Meson added -Doptimization and -Ddebug options, which obviously causes -a conflict with our -Ddebug options. Let's rename it. - -Fixes #9883. ---- - meson.build | 2 +- - meson_options.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index f79ac4b12e7..2209c935ad6 100644 ---- a/meson.build -+++ b/meson.build -@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) - - enable_debug_hashmap = false - enable_debug_mmap_cache = false --foreach name : get_option('debug') -+foreach name : get_option('debug-extra') - if name == 'hashmap' - enable_debug_hashmap = true - elif name == 'mmap-cache' -diff --git a/meson_options.txt b/meson_options.txt -index e3140c8c110..7b1f61bf464 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', - description : 'path to debug shell binary') - option('debug-tty', type : 'string', value : '/dev/tty9', - description : 'specify the tty device for debug shell') --option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], -+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], - description : 'enable extra debugging') - option('memory-accounting-default', type : 'boolean', - description : 'enable MemoryAccounting= by default') diff --git a/sys-apps/systemd/files/gentoo-generator-path.patch b/sys-apps/systemd/files/gentoo-generator-path.patch deleted file mode 100644 index 6912b481f20b..000000000000 --- a/sys-apps/systemd/files/gentoo-generator-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Mon, 17 Jul 2017 11:21:25 -0400 -Subject: [PATCH 1/3] path-lookup: look for generators in - {,/usr}/lib/systemd/system-generators - -Bug: https://bugs.gentoo.org/625402 ---- - src/shared/path-lookup.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index e2b3f8b74..1ee0e1cdb 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -821,6 +821,8 @@ char **generator_binary_paths(UnitFileScope scope) { - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", -+ "/usr/lib/systemd/system-generators", -+ "/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH, - NULL); - --- -2.14.0 - |