meson: Remove support for upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

diff --git a/meson.build b/meson.build
index cb6f17fa4c58791982df138e5d5984336868cd37..d1527679e70aa2760e5507f0ef757144d1a324b0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -886,7 +886,6 @@ subdir('config/etc')
 subdir('config/init/common')
 subdir('config/init/systemd')
 subdir('config/init/sysvinit')
-subdir('config/init/upstart')
 if want_selinux
     subdir('config/selinux')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 7eb14e92c18d6f613ea7f6055a1db33b6b55b6cf..5af850be9ce1de7109d55cf5da94001c94be5306 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,7 +15,7 @@ option('examples', type: 'boolean', value: 'true',
 
 # was --init-script in autotools
 option('init-script', type : 'array',
-       choices : ['systemd', 'sysvinit', 'upstart'], value : ['systemd'],
+       choices : ['systemd', 'sysvinit'], value : ['systemd'],
        description : 'init script')
 
 # was --systemd-unidir in autotools