From bbbe7fb63b87786021e22cbb5f5eda07a8d29752 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 9 Oct 2017 15:11:25 -0700 Subject: [PATCH] systemd: update to 235 and use meson --- packages/sysutils/systemd/package.mk | 172 +++++++++--------- ...d-system-to-storage-.config-system.d.patch | 50 ++--- .../systemd-0003-remove-xlocale.h.patch | 27 --- 3 files changed, 103 insertions(+), 146 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-0003-remove-xlocale.h.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 5dd564fa3b..7cbbc42f03 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="233" -PKG_SHA256="8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083" +PKG_VERSION="235" +PKG_SHA256="25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" @@ -27,98 +27,94 @@ PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy" PKG_SECTION="system" PKG_SHORTDESC="systemd: a system and session manager" PKG_LONGDESC="systemd is a system and session manager for Linux, compatible with SysV and LSB init scripts. systemd 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 cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit." -PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_have_decl_IFLA_BOND_AD_INFO=no \ - ac_cv_have_decl_IFLA_BRPORT_UNICAST_FLOOD=no \ - ac_cv_path_MOUNT_PATH="/usr/bin/mount" - ac_cv_path_UMOUNT_PATH="/usr/bin/umount" - KMOD=/usr/bin/kmod \ - --disable-nls \ - --disable-lto \ - --disable-dbus \ - --disable-utmp \ - --disable-coverage \ - --enable-kmod \ - --disable-xkbcommon \ - --enable-blkid \ - --disable-seccomp \ - --disable-ima \ - --disable-selinux \ - --disable-apparmor \ - --disable-xz \ - --disable-zlib \ - --disable-bzip2 \ - --disable-lz4 \ - --disable-pam \ - --disable-acl \ - --disable-smack \ - --disable-gcrypt \ - --disable-audit \ - --disable-elfutils \ - --disable-libcryptsetup \ - --disable-qrencode \ - --disable-microhttpd \ - --disable-gnutls \ - --disable-libcurl \ - --disable-libidn \ - --disable-libiptc \ - --disable-binfmt \ - --disable-vconsole \ - --disable-quotacheck \ - --enable-tmpfiles \ - --disable-environment-d \ - --disable-sysusers \ - --disable-firstboot \ - --disable-randomseed \ - --disable-backlight \ - --disable-rfkill \ - --enable-logind \ - --disable-machined \ - --disable-importd \ - --disable-hostnamed \ - --disable-timedated \ - --disable-timesyncd \ - --disable-localed \ - --disable-coredump \ - --disable-polkit \ - --disable-resolved \ - --disable-networkd \ - --disable-efi \ - --disable-gnuefi \ - --disable-kdbus \ - --disable-myhostname \ - --enable-hwdb \ - --disable-manpages \ - --disable-hibernate \ - --disable-ldconfig \ - --disable-split-usr \ - --disable-tests \ - --without-python \ - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ - --with-tty-gid=5 \ - --with-dbuspolicydir=/etc/dbus-1/system.d \ - --with-dbussessionservicedir=/usr/share/dbus-1/services \ - --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ - --with-rootprefix=/usr \ - --with-rootlibdir=/usr/lib \ - --with-default-hierarchy=hybrid" - -pre_build_target() { -# broken autoreconf - ( cd $PKG_BUILD - intltoolize --force - ) -} +PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ + -Drootprefix=/usr \ + -Dsplit-usr=false \ + -Ddefault-hierarchy=hybrid \ + -Dtty-gid=5 \ + -Dseccomp=false \ + -Dselinux=false \ + -Dapparmor=false \ + -Dpolkit=false \ + -Dacl=false \ + -Daudit=false \ + -Dblkid=true \ + -Dkmod=true \ + -Dpam=false \ + -Dmicrohttpd=false \ + -Dlibcryptsetup=false \ + -Dlibcurl=false \ + -Dlibidn=false \ + -Dlibidn2=false \ + -Dlibiptc=false \ + -Dqrencode=false \ + -Dgcrypt=false \ + -Dgnutls=false \ + -Delfutils=false \ + -Dzlib=false \ + -Dbzip2=false \ + -Dxz=false \ + -Dlz4=false \ + -Dxkbcommon=false \ + -Dglib=false \ + -Ddbus=false \ + -Ddefault-dnssec=no \ + -Dimportd=false \ + -Dremote=false \ + -Dutmp=false \ + -Dhibernate=false \ + -Denvironment-d=false \ + -Dbinfmt=false \ + -Dcoredump=false \ + -Dresolve=false \ + -Dlogind=true \ + -Dhostnamed=false \ + -Dlocaled=false \ + -Dmachined=false \ + -Dnetworkd=false \ + -Dtimedated=false \ + -Dtimesyncd=false \ + -Dmyhostname=false \ + -Dfirstboot=false \ + -Drandomseed=false \ + -Dbacklight=false \ + -Dvconsole=false \ + -Dquotacheck=false \ + -Dsysusers=false \ + -Dtmpfiles=true \ + -Dhwdb=true \ + -Drfkill=false \ + -Dldconfig=false \ + -Defi=false \ + -Dtpm=false \ + -Dima=false \ + -Dsmack=false \ + -Dgshadow=false \ + -Didn=false \ + -Dnss-systemd=false \ + -Dman=false \ + -Dhtml=false \ + -Dbashcompletiondir=no \ + -Dzshcompletiondir=no \ + -Dkill-path=/usr/bin/kill \ + -Dkmod-path=/usr/bin/kmod \ + -Dmount-path=/usr/bin/mount \ + -Dumount-path=/usr/bin/umount" pre_configure_target() { export CFLAGS="$CFLAGS -fno-schedule-insns -fno-schedule-insns2" + export LC_ALL=en_US.UTF-8 + + # meson needs a host compiler and it's detected through the environment. meh. + export CC="$HOST_CC" + export CXX="$HOST_CXX" } post_makeinstall_target() { # remove unneeded stuff + rm -rf $INSTALL/etc/init.d + rm -rf $INSTALL/etc/pam.d rm -rf $INSTALL/etc/systemd/system rm -rf $INSTALL/etc/xdg rm -rf $INSTALL/etc/X11 @@ -169,6 +165,10 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/lib/systemd/system/systemd-udev-hwdb-update.service rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-udev-hwdb-update.service + # remove systemd-user-sessions + rm -rf $INSTALL/usr/lib/systemd/system/systemd-user-sessions.service + rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-user-sessions.service + # remove nspawn rm -rf $INSTALL/usr/bin/systemd-nspawn rm -rf $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service diff --git a/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch b/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch index f7a1242fcc..de8732f376 100644 --- a/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch +++ b/packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch @@ -1,35 +1,19 @@ -From 56daac6a053159bbc5dc22d85c6ecd66b7369aae Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Thu, 19 Dec 2013 11:21:13 +0200 -Subject: [PATCH 2/8] move /etc/systemd/system to /storage/.config/system.d +commit abce2c21148f981034acf143a3c12e5919949198 +Author: Lukas Rusak +Date: Mon Oct 9 15:26:58 2017 -0700 ---- - Makefile.am | 4 ++-- - Makefile.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index bf04d31..36c269e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -166,7 +166,7 @@ udevlibexec_PROGRAMS = - AM_CPPFLAGS = \ - -include $(top_builddir)/config.h \ - -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ -- -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -+ -DSYSTEM_CONFIG_UNIT_PATH=\"/storage/.config/system.d\" \ - -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ - -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ - -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -@@ -6210,7 +6210,7 @@ substitutions = \ - '|SYSTEMCTL=$(rootbindir)/systemctl|' \ - '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ - '|pkgsysconfdir=$(pkgsysconfdir)|' \ -- '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \ -+ '|SYSTEM_CONFIG_UNIT_PATH=/storage/.config/system.d|' \ - '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \ - '|pkgdatadir=$(pkgdatadir)|' \ - '|systemunitdir=$(systemunitdir)|' \ --- -1.7.10.4 + move /etc/systemd/system to /storage/.config/system.d +diff --git a/meson.build b/meson.build +index f7a610a..b1144a6 100644 +--- a/meson.build ++++ b/meson.build +@@ -146,7 +146,7 @@ if pamconfdir == '' + endif + + conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir) +-conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'system')) ++conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', '/storage/.config/system.d') + conf.set_quoted('SYSTEM_DATA_UNIT_PATH', systemunitdir) + conf.set_quoted('SYSTEM_SYSVINIT_PATH', sysvinit_path) + conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path) diff --git a/packages/sysutils/systemd/patches/systemd-0003-remove-xlocale.h.patch b/packages/sysutils/systemd/patches/systemd-0003-remove-xlocale.h.patch deleted file mode 100644 index 7a28cc4d15..0000000000 --- a/packages/sysutils/systemd/patches/systemd-0003-remove-xlocale.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c50b8332092178378257c2de800fb6b6b4a8706 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 3 Jul 2017 08:45:04 -0700 -Subject: [PATCH] parse-util: Do not include unneeded xlocale.h - -Signed-off-by: Khem Raj ---- -Upstream-Status: Backport [ partial https://github.com/systemd/systemd/commit/284d1cd0a12cad96a5ea61d1afb0dd677dbd147e] - - src/basic/parse-util.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index c98815b9b..a0eb45805 100644 ---- a/src/basic/parse-util.c - b/src/basic/parse-util.c -@@ -23,7 +23,6 @@ - #include - #include - #include --#include - - #include "alloc-util.h" - #include "extract-word.h" --- -2.13.2 -