Commit 9191dc92 authored by Martin Pitt's avatar Martin Pitt

Split out "systemd-container" package with machined and nspawn and enable importd

Add new libbz2-dev, zlib1g-dev, and libcurl-dev build deps. LP: #1448900
parent 6dfd6d2d
......@@ -15,6 +15,9 @@ systemd (224-2) UNRELEASED; urgency=medium
(Closes: #796389)
* Install /lib/systemd/network/* into udev instead of systemd, as it's
really udev which is evaluating these.
* Split out "systemd-container" package with machined and nspawn and enable
importd. Add new libbz2-dev, zlib1g-dev, and libcurl-dev build deps.
(LP: #1448900)
[ Helmut Grohne ]
* Improve support for cross-building and bootstrapping.
......
......@@ -32,6 +32,9 @@ Build-Depends: debhelper (>= 9),
libselinux1-dev (>= 2.1.9),
libacl1-dev,
liblzma-dev,
libbz2-dev,
zlib1g-dev | libz-dev,
libcurl4-gnutls-dev | libcurl-dev,
libgcrypt11-dev,
libkmod-dev (>= 15),
libblkid-dev (>= 2.24),
......@@ -47,7 +50,8 @@ Section: admin
Priority: important
Recommends: libpam-systemd,
dbus
Suggests: systemd-ui
Suggests: systemd-ui,
systemd-container
Pre-Depends: ${shlibs:Pre-Depends},
${misc:Pre-Depends}
Depends: ${shlibs:Depends},
......@@ -106,6 +110,32 @@ Description: system and service manager - SysV links
to replace sysvinit. Installing systemd-sysv will overwrite /sbin/init with a
link to systemd.
Package: systemd-container
Architecture: linux-any
Multi-Arch: foreign
Section: admin
Priority: optional
Conflicts: systemd (<< 224-2)
Replaces: systemd (<< 224-2)
Depends: ${shlibs:Depends},
${misc:Depends},
systemd,
Description: systemd container/nspawn tools
systemd is a system and service manager for Linux. It provides aggressive
parallelization capabilities, uses socket and D-Bus activation for starting
services, offers on-demand starting of daemons, keeps track of processes
using Linux control groups, supports snapshotting and restoring of the system
state, maintains mount and automount points and implements an elaborate
transactional dependency-based service control logic.
.
systemd is compatible with SysV and LSB init scripts and can work as a
drop-in replacement for sysvinit.
.
This package provides systemd's tools for nspawn and container/VM management:
* systemd-nspawn
* systemd-machined and machinectl
* systemd-importd
Package: libpam-systemd
Architecture: linux-any
Multi-Arch: same
......
......@@ -28,7 +28,6 @@ CONFFLAGS = \
--disable-qrencode \
--disable-microhttpd \
--disable-gnutls \
--disable-libcurl \
--disable-libidn \
--disable-elfutils \
--disable-vconsole \
......@@ -36,7 +35,6 @@ CONFFLAGS = \
--disable-firstboot \
--disable-coredump \
--disable-xkbcommon \
--disable-importd \
--disable-libiptc \
--disable-silent-rules \
--with-ntp-servers="$(DEFAULT_NTP_SERVERS)" \
......@@ -48,6 +46,8 @@ CONFFLAGS_deb = \
--enable-compat-libs \
--enable-hwdb \
--enable-efi \
--enable-libcurl \
--enable-importd \
PYTHON=python3
ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
......@@ -71,6 +71,8 @@ CONFFLAGS_udeb = \
--disable-backlight \
--disable-logind \
--disable-machined \
--disable-libcurl \
--disable-importd \
--disable-hostnamed \
--disable-timedated \
--disable-networkd \
......
etc/dbus-1/system.d/org.freedesktop.import1.conf
etc/dbus-1/system.d/org.freedesktop.machine1.conf
bin/machinectl
lib/systemd/import-pubring.gpg
lib/systemd/systemd-machined
lib/systemd/systemd-export
lib/systemd/systemd-import*
lib/systemd/systemd-pull
lib/systemd/system/systemd-nspawn@.service
lib/systemd/system/systemd-importd.service
lib/systemd/system/org.freedesktop.import1.busname
lib/systemd/system/org.freedesktop.machine1.busname
lib/systemd/system/var-lib-machines.mount
lib/systemd/system/machines.target
lib/systemd/system/local-fs.target.wants/var-lib-machines.mount
lib/systemd/system/busnames.target.wants/org.freedesktop.import1.busname
lib/systemd/system/busnames.target.wants/org.freedesktop.machine1.busname
lib/systemd/system/dbus-org.freedesktop.import1.service
lib/systemd/system/dbus-org.freedesktop.machine1.service
usr/bin/systemd-nspawn
usr/lib/tmpfiles.d/systemd-nspawn.conf
usr/share/dbus-1/system-services/org.freedesktop.import1.service
usr/share/dbus-1/system-services/org.freedesktop.machine1.service
usr/share/man/man*/*nspawn*
usr/share/man/man*/machinectl*
usr/share/man/man*/systemd-machined*
usr/share/polkit-1/actions/org.freedesktop.import1.policy
usr/share/polkit-1/actions/org.freedesktop.machine1.policy
usr/share/zsh/vendor-completions/_systemd-nspawn
usr/share/zsh/vendor-completions/_sd_machines
usr/share/zsh/vendor-completions/_machinectl
usr/share/bash-completion/completions/machinectl
usr/share/bash-completion/completions/systemd-nspawn
systemd (224-2) unstable; urgency=medium
* This version splits out systemd-nspawn, systemd-machined, and machinectl
into the new "systemd-container" package. That now also enables
systemd-importd.
-- Martin Pitt <mpitt@debian.org> Sat, 22 Aug 2015 15:58:43 +0200
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment