summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/systemd-219/0001-missing-defined-extra-clock-ids.patch (renamed from patches/systemd-218/0001-missing-defined-extra-clock-ids.patch)0
-rw-r--r--patches/systemd-219/0002-missing-add-BPF_XOR.patch (renamed from patches/systemd-218/0002-missing-add-BPF_XOR.patch)0
-rw-r--r--patches/systemd-219/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch (renamed from patches/systemd-218/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch)0
-rw-r--r--patches/systemd-219/series (renamed from patches/systemd-218/series)0
-rw-r--r--rules/host-systemd.make15
-rw-r--r--rules/systemd.make15
-rw-r--r--rules/udev.make1
7 files changed, 26 insertions, 5 deletions
diff --git a/patches/systemd-218/0001-missing-defined-extra-clock-ids.patch b/patches/systemd-219/0001-missing-defined-extra-clock-ids.patch
index c3d9851f3..c3d9851f3 100644
--- a/patches/systemd-218/0001-missing-defined-extra-clock-ids.patch
+++ b/patches/systemd-219/0001-missing-defined-extra-clock-ids.patch
diff --git a/patches/systemd-218/0002-missing-add-BPF_XOR.patch b/patches/systemd-219/0002-missing-add-BPF_XOR.patch
index cdc04ec1b..cdc04ec1b 100644
--- a/patches/systemd-218/0002-missing-add-BPF_XOR.patch
+++ b/patches/systemd-219/0002-missing-add-BPF_XOR.patch
diff --git a/patches/systemd-218/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch b/patches/systemd-219/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
index 468a1a4b6..468a1a4b6 100644
--- a/patches/systemd-218/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
+++ b/patches/systemd-219/0003-HACK-sd-pppoe-don-t-use-linux-ppp-ioctl.h.patch
diff --git a/patches/systemd-218/series b/patches/systemd-219/series
index 2c4a77aad..2c4a77aad 100644
--- a/patches/systemd-218/series
+++ b/patches/systemd-219/series
diff --git a/rules/host-systemd.make b/rules/host-systemd.make
index bc258f648..7eb8ea677 100644
--- a/rules/host-systemd.make
+++ b/rules/host-systemd.make
@@ -38,9 +38,11 @@ HOST_SYSTEMD_CONF_OPT := \
--disable-undefined-sanitizer \
--disable-python-devel \
--disable-dbus \
+ --disable-utmp \
--disable-compat-libs \
--disable-coverage \
--disable-kmod \
+ --disable-xkbcommon \
--disable-blkid \
--disable-seccomp \
--disable-ima \
@@ -48,6 +50,9 @@ HOST_SYSTEMD_CONF_OPT := \
--disable-selinux \
--disable-apparmor \
--disable-xz \
+ --disable-zlib \
+ --enable-bzip2 \
+ --disable-lz4 \
--disable-pam \
--disable-acl \
--disable-smack \
@@ -58,17 +63,22 @@ HOST_SYSTEMD_CONF_OPT := \
--disable-qrencode \
--disable-microhttpd \
--disable-gnutls \
+ --disable-libcurl \
+ --disable-libidn \
+ --disable-libiptc \
--disable-binfmt \
--disable-vconsole \
--disable-bootchart \
--disable-quotacheck \
--disable-tmpfiles \
--disable-sysusers \
+ --disable-firstboot \
--disable-randomseed \
--disable-backlight \
--disable-rfkill \
--disable-logind \
--disable-machined \
+ --disable-importd \
--disable-hostnamed \
--disable-timedated \
--disable-timesyncd \
@@ -78,12 +88,17 @@ HOST_SYSTEMD_CONF_OPT := \
--disable-resolved \
--disable-networkd \
--disable-efi \
+ --disable-terminal \
--disable-kdbus \
--disable-myhostname \
--disable-gudev \
+ --enable-hwdb \
--disable-manpages \
+ --disable-hibernate \
+ --disable-ldconfig \
--enable-split-usr \
--disable-tests \
+ --disable-debug \
--without-python \
--with-ntp-servers= \
--with-dns-servers= \
diff --git a/rules/systemd.make b/rules/systemd.make
index 02cedd388..224f4c68d 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
#
# Paths and names
#
-SYSTEMD_VERSION := 218
-SYSTEMD_MD5 := 4e2c511b0a7932d7fc9d79822273aac6
+SYSTEMD_VERSION := 219
+SYSTEMD_MD5 := e0d6c9a4b4f69f66932d2230298c9a34
SYSTEMD := systemd-$(SYSTEMD_VERSION)
SYSTEMD_SUFFIX := tar.xz
SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
@@ -78,6 +78,8 @@ SYSTEMD_CONF_OPT := \
$(GLOBAL_SELINUX_OPTION) \
--disable-apparmor \
--$(call ptx/endis,PTXCONF_SYSTEMD_XZ)-xz \
+ --disable-zlib \
+ --enable-bzip2 \
--disable-lz4 \
--disable-pam \
--disable-acl \
@@ -91,6 +93,7 @@ SYSTEMD_CONF_OPT := \
--disable-gnutls \
--disable-libcurl \
--disable-libidn \
+ --disable-libiptc \
--disable-binfmt \
--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
--enable-bootchart \
@@ -103,6 +106,7 @@ SYSTEMD_CONF_OPT := \
--disable-rfkill \
--$(call ptx/endis,PTXCONF_SYSTEMD_LOGIND)-logind \
--disable-machined \
+ --disable-importd \
--enable-hostnamed \
--$(call ptx/endis,PTXCONF_SYSTEMD_TIMEDATE)-timedated \
--$(call ptx/endis,PTXCONF_SYSTEMD_TIMEDATE)-timesyncd \
@@ -116,12 +120,13 @@ SYSTEMD_CONF_OPT := \
--disable-kdbus \
--enable-myhostname \
--$(call ptx/endis,PTXCONF_UDEV_LIBGUDEV)-gudev \
+ --$(call ptx/endis,PTXCONF_UDEV_HWDB)-hwdb \
--disable-manpages \
--disable-hibernate \
--disable-ldconfig \
--enable-split-usr \
--disable-tests \
- --disable-hashmap-debug \
+ --disable-debug \
--without-python \
--with-ntp-servers= \
--with-time-epoch=`date --date "$(PTXDIST_VERSION_YEAR)-$(PTXDIST_VERSION_MONTH)-01" +%s` \
@@ -134,7 +139,6 @@ SYSTEMD_CONF_OPT := \
--with-dbuspolicydir=/etc/dbus-1/system.d \
--with-dbussessionservicedir=/usr/share/dbus-1/services \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
- --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
--with-rootprefix= \
--with-rootlibdir=/lib
@@ -153,7 +157,7 @@ $(STATEDIR)/systemd.install:
@$(call targetinfo)
@$(call world/install, SYSTEMD)
ifdef PTXCONF_UDEV_HWDB
- @udevadm hwdb --update --root $(SYSTEMD_PKGDIR)
+ @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
endif
ifndef PTXCONF_SYSTEMD_VCONSOLE
@rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
@@ -322,6 +326,7 @@ endif
# # systemd expects this directory to exist.
@$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd/coredump)
+ @$(call install_copy, systemd, 0, 0, 0700, /var/lib/machines)
@$(call install_alternative, systemd, 0, 0, 0644, /etc/profile.d/systemd.sh)
diff --git a/rules/udev.make b/rules/udev.make
index 46239f461..dffb91d01 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -104,6 +104,7 @@ UDEV_RULES-$(PTXCONF_SYSTEMD) += \
60-drm.rules \
64-btrfs.rules \
70-mouse.rules \
+ 70-touchpad.rules \
80-net-setup-link.rules
UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \