summaryrefslogtreecommitdiff
path: root/package/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'package/systemd')
-rw-r--r--package/systemd/Makefile4
-rw-r--r--package/systemd/patches/patch-meson_build108
-rw-r--r--package/systemd/patches/patch-meson_options_txt11
3 files changed, 2 insertions, 121 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index e37e4b603..88dd286ab 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= systemd
-PKG_VERSION:= 236
+PKG_VERSION:= 237
PKG_RELEASE:= 1
-PKG_HASH:= 0cadccfa7109232ec2a469d41ca595d5595b83b648b534ea669c15dbca904c43
+PKG_HASH:= c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c
PKG_DESCR:= system and service manager
PKG_SECTION:= base/init
PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod
diff --git a/package/systemd/patches/patch-meson_build b/package/systemd/patches/patch-meson_build
deleted file mode 100644
index ce1c3596a..000000000
--- a/package/systemd/patches/patch-meson_build
+++ /dev/null
@@ -1,108 +0,0 @@
---- systemd-236.orig/meson.build 2017-12-14 23:09:57.000000000 +0100
-+++ systemd-236/meson.build 2018-01-01 21:03:50.570757021 +0100
-@@ -260,10 +260,12 @@ cc = meson.get_compiler('c')
- pkgconfig = import('pkgconfig')
- check_compilation_sh = find_program('tools/meson-check-compilation.sh')
-
--cxx = find_program('c++', required : false)
--if cxx.found()
-- # Used only for tests
-- add_languages('cpp')
-+if get_option('tests') != 'false'
-+ cxx = find_program('c++', required : false)
-+ if cxx.found()
-+ # Used only for tests
-+ add_languages('cpp')
-+ endif
- endif
-
- foreach arg : ['-Wextra',
-@@ -2388,48 +2390,51 @@ executable('systemd-sulogin-shell',
- install_dir : rootlibexecdir)
-
- ############################################################
-+if want_tests == 'false'
-+ message('Not compiling because tests is set to false')
-+else
-+ foreach tuple : tests
-+ sources = tuple[0]
-+ link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
-+ dependencies = tuple[2]
-+ condition = tuple.length() >= 4 ? tuple[3] : ''
-+ type = tuple.length() >= 5 ? tuple[4] : ''
-+ defs = tuple.length() >= 6 ? tuple[5] : []
-+ incs = tuple.length() >= 7 ? tuple[6] : includes
-+ timeout = 30
-
--foreach tuple : tests
-- sources = tuple[0]
-- link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
-- dependencies = tuple[2]
-- condition = tuple.length() >= 4 ? tuple[3] : ''
-- type = tuple.length() >= 5 ? tuple[4] : ''
-- defs = tuple.length() >= 6 ? tuple[5] : []
-- incs = tuple.length() >= 7 ? tuple[6] : includes
-- timeout = 30
--
-- name = sources[0].split('/')[-1].split('.')[0]
-- if type.startswith('timeout=')
-- timeout = type.split('=')[1].to_int()
-- type = ''
-- endif
-+ name = sources[0].split('/')[-1].split('.')[0]
-+ if type.startswith('timeout=')
-+ timeout = type.split('=')[1].to_int()
-+ type = ''
-+ endif
-
-- if condition == '' or conf.get(condition) == 1
-- exe = executable(
-- name,
-- sources,
-- include_directories : incs,
-- link_with : link_with,
-- dependencies : dependencies,
-- c_args : defs,
-- install_rpath : rootlibexecdir,
-- install : install_tests,
-- install_dir : join_paths(testsdir, type))
-+ if condition == '' or conf.get(condition) == 1
-+ exe = executable(
-+ name,
-+ sources,
-+ include_directories : incs,
-+ link_with : link_with,
-+ dependencies : dependencies,
-+ c_args : defs,
-+ install_rpath : rootlibexecdir,
-+ install : install_tests,
-+ install_dir : join_paths(testsdir, type))
-
-- if type == 'manual'
-- message('@0@ is a manual test'.format(name))
-- elif type == 'unsafe' and want_tests != 'unsafe'
-- message('@0@ is an unsafe test'.format(name))
-+ if type == 'manual'
-+ message('@0@ is a manual test'.format(name))
-+ elif type == 'unsafe' and want_tests != 'unsafe'
-+ message('@0@ is an unsafe test'.format(name))
-+ else
-+ test(name, exe,
-+ env : test_env,
-+ timeout : timeout)
-+ endif
- else
-- test(name, exe,
-- env : test_env,
-- timeout : timeout)
-+ message('Not compiling @0@ because @1@ is not true'.format(name, condition))
- endif
-- else
-- message('Not compiling @0@ because @1@ is not true'.format(name, condition))
-- endif
--endforeach
-+ endforeach
-+endif
-
- test_libsystemd_sym = executable(
- 'test-libsystemd-sym',
diff --git a/package/systemd/patches/patch-meson_options_txt b/package/systemd/patches/patch-meson_options_txt
deleted file mode 100644
index d1845921f..000000000
--- a/package/systemd/patches/patch-meson_options_txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemd-236.orig/meson_options.txt 2017-12-14 23:09:57.000000000 +0100
-+++ systemd-236/meson_options.txt 2018-01-01 21:03:50.574757135 +0100
-@@ -284,7 +284,7 @@ option('bashcompletiondir', type : 'stri
- option('zshcompletiondir', type : 'string',
- description : 'directory for zsh completion scripts ["no" disables]')
-
--option('tests', type : 'combo', choices : ['true', 'unsafe'],
-+option('tests', type : 'combo', choices : ['true', 'unsafe', 'false'],
- description : 'enable extra tests with =unsafe')
- option('slow-tests', type : 'boolean', value : 'false',
- description : 'run the slow tests by default')