diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-12-18 17:29:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:54 +0000 |
commit | f4f3444947dd33f28d3285799a9f689fc0b56a92 (patch) | |
tree | 08888d6c6b98b5a4f01300d61d348f2be4c212af /meta/recipes-core/systemd | |
parent | 924cbe39df6ef180e4ff32f2602cb822ec6e5ebe (diff) | |
download | poky-f4f3444947dd33f28d3285799a9f689fc0b56a92.tar.gz |
systemd: backport a patch to fix meson 0.49.0 issue
(From OE-Core rev: 81ecfbb19ccb5b5241cfdd871d41459bda3dba4d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
3 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_239.bb b/meta/recipes-core/systemd/systemd-boot_239.bb index 7fe420c262..312a0145d8 100644 --- a/meta/recipes-core/systemd/systemd-boot_239.bb +++ b/meta/recipes-core/systemd/systemd-boot_239.bb | |||
@@ -6,6 +6,7 @@ DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" | |||
6 | SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ | 6 | SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ |
7 | file://0006-remove-nobody-user-group-checking.patch \ | 7 | file://0006-remove-nobody-user-group-checking.patch \ |
8 | file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ | 8 | file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ |
9 | file://0001-meson-rename-Ddebug-to-Ddebug-extra.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | inherit meson pkgconfig gettext | 12 | inherit meson pkgconfig gettext |
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch b/meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch new file mode 100644 index 0000000000..d6d305cb37 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-meson-rename-Ddebug-to-Ddebug-extra.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||
3 | Date: Sun, 19 Aug 2018 19:11:30 +0200 | ||
4 | Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra | ||
5 | |||
6 | Meson added -Doptimization and -Ddebug options, which obviously causes | ||
7 | a conflict with our -Ddebug options. Let's rename it. | ||
8 | |||
9 | Fixes #9883. | ||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | meson.build | 2 +- | ||
14 | meson_options.txt | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index f79ac4b12..2209c935a 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) | ||
22 | |||
23 | enable_debug_hashmap = false | ||
24 | enable_debug_mmap_cache = false | ||
25 | -foreach name : get_option('debug') | ||
26 | +foreach name : get_option('debug-extra') | ||
27 | if name == 'hashmap' | ||
28 | enable_debug_hashmap = true | ||
29 | elif name == 'mmap-cache' | ||
30 | diff --git a/meson_options.txt b/meson_options.txt | ||
31 | index e3140c8c1..7b1f61bf4 100644 | ||
32 | --- a/meson_options.txt | ||
33 | +++ b/meson_options.txt | ||
34 | @@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', | ||
35 | description : 'path to debug shell binary') | ||
36 | option('debug-tty', type : 'string', value : '/dev/tty9', | ||
37 | description : 'specify the tty device for debug shell') | ||
38 | -option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], | ||
39 | +option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], | ||
40 | description : 'enable extra debugging') | ||
41 | option('memory-accounting-default', type : 'boolean', | ||
42 | description : 'enable MemoryAccounting= by default') | ||
43 | -- | ||
44 | 2.17.1 | ||
45 | |||
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 03acce25b7..e0c71de018 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb | |||
@@ -37,6 +37,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
37 | file://0001-timesync-changes-type-of-drift_freq-to-int64_t.patch \ | 37 | file://0001-timesync-changes-type-of-drift_freq-to-int64_t.patch \ |
38 | file://0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch \ | 38 | file://0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch \ |
39 | file://0002-core-Fix-use-after-free-case-in-load_from_path.patch \ | 39 | file://0002-core-Fix-use-after-free-case-in-load_from_path.patch \ |
40 | file://0001-meson-rename-Ddebug-to-Ddebug-extra.patch \ | ||
40 | " | 41 | " |
41 | 42 | ||
42 | # patches made for musl are only applied on TCLIBC is musl | 43 | # patches made for musl are only applied on TCLIBC is musl |