diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-04-15 11:32:50 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-07 12:55:38 +0200 |
| commit | 0de84364e374591b71826e56302e5228bc0d2dab (patch) | |
| tree | dc3ae051d9fdd11896c6829b985f086dfd77de3c /buildlib | |
| parent | ab67c39b9cdd28d11dd43fe48bd1fdeab60d4c2f (diff) | |
Prevent shutdown while running dpkg
As long as we are running dpkg, keep an inhibitor that
blocks us from shutting down.
LP: #1820886
(cherry picked from commit 96aef11a5cf400377a52f7e93e70944b17e249d1)
(cherry picked from commit 8ea79afcadead5a5b7d94bf8623cb833859f6d80)
(cherry picked from commit c5b8a857f2535fe284426cefda2fbd1bbb3d5808)
Also fixup prepare-release for CI to handle [linux-any] build-dep,
and do the whole autoconf / makefile stuff.
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/config.h.in | 3 | ||||
| -rw-r--r-- | buildlib/environment.mak.in | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/buildlib/config.h.in b/buildlib/config.h.in index fb21b387f..3179beb69 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -17,6 +17,9 @@ /* Define if we have the lz4 library for lz4 */ #undef HAVE_LZ4 +/* Define if we have the systemd library */ +#undef HAVE_SYSTEMD + /* These two are used by the statvfs shim for glibc2.0 and bsd */ /* Define if we have sys/vfs.h */ #undef HAVE_VFS_H diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 9620722de..2df4786f9 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -71,6 +71,9 @@ HAVE_BZ2 = @HAVE_BZ2@ HAVE_LZMA = @HAVE_LZMA@ HAVE_LZ4 = @HAVE_LZ4@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ +HAVE_SYSTEMD = @HAVE_SYSTEMD@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ # Shared library things HOST_OS = @host_os@ |