jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: update to 235 and use meson

Browse Source
This commit is contained in:
Lukas Rusak 2017-10-09 15:11:25 -07:00
parent b9866fc439
commit bbbe7fb63b
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
3 changed files with 103 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
packages/sysutils/systemd/package.mk
View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="systemd" PKG_NAME="systemd"
PKG_VERSION="233" PKG_VERSION="235"
PKG_SHA256="8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083" PKG_SHA256="25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" 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_SECTION="system"
PKG_SHORTDESC="systemd: a system and session manager" 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_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 \ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
ac_cv_have_decl_IFLA_BOND_AD_INFO=no \ -Drootprefix=/usr \
ac_cv_have_decl_IFLA_BRPORT_UNICAST_FLOOD=no \ -Dsplit-usr=false \
ac_cv_path_MOUNT_PATH="/usr/bin/mount" -Ddefault-hierarchy=hybrid \
ac_cv_path_UMOUNT_PATH="/usr/bin/umount" -Dtty-gid=5 \
KMOD=/usr/bin/kmod \ -Dseccomp=false \
--disable-nls \ -Dselinux=false \
--disable-lto \ -Dapparmor=false \
--disable-dbus \ -Dpolkit=false \
--disable-utmp \ -Dacl=false \
--disable-coverage \ -Daudit=false \
--enable-kmod \ -Dblkid=true \
--disable-xkbcommon \ -Dkmod=true \
--enable-blkid \ -Dpam=false \
--disable-seccomp \ -Dmicrohttpd=false \
--disable-ima \ -Dlibcryptsetup=false \
--disable-selinux \ -Dlibcurl=false \
--disable-apparmor \ -Dlibidn=false \
--disable-xz \ -Dlibidn2=false \
--disable-zlib \ -Dlibiptc=false \
--disable-bzip2 \ -Dqrencode=false \
--disable-lz4 \ -Dgcrypt=false \
--disable-pam \ -Dgnutls=false \
--disable-acl \ -Delfutils=false \
--disable-smack \ -Dzlib=false \
--disable-gcrypt \ -Dbzip2=false \
--disable-audit \ -Dxz=false \
--disable-elfutils \ -Dlz4=false \
--disable-libcryptsetup \ -Dxkbcommon=false \
--disable-qrencode \ -Dglib=false \
--disable-microhttpd \ -Ddbus=false \
--disable-gnutls \ -Ddefault-dnssec=no \
--disable-libcurl \ -Dimportd=false \
--disable-libidn \ -Dremote=false \
--disable-libiptc \ -Dutmp=false \
--disable-binfmt \ -Dhibernate=false \
--disable-vconsole \ -Denvironment-d=false \
--disable-quotacheck \ -Dbinfmt=false \
--enable-tmpfiles \ -Dcoredump=false \
--disable-environment-d \ -Dresolve=false \
--disable-sysusers \ -Dlogind=true \
--disable-firstboot \ -Dhostnamed=false \
--disable-randomseed \ -Dlocaled=false \
--disable-backlight \ -Dmachined=false \
--disable-rfkill \ -Dnetworkd=false \
--enable-logind \ -Dtimedated=false \
--disable-machined \ -Dtimesyncd=false \
--disable-importd \ -Dmyhostname=false \
--disable-hostnamed \ -Dfirstboot=false \
--disable-timedated \ -Drandomseed=false \
--disable-timesyncd \ -Dbacklight=false \
--disable-localed \ -Dvconsole=false \
--disable-coredump \ -Dquotacheck=false \
--disable-polkit \ -Dsysusers=false \
--disable-resolved \ -Dtmpfiles=true \
--disable-networkd \ -Dhwdb=true \
--disable-efi \ -Drfkill=false \
--disable-gnuefi \ -Dldconfig=false \
--disable-kdbus \ -Defi=false \
--disable-myhostname \ -Dtpm=false \
--enable-hwdb \ -Dima=false \
--disable-manpages \ -Dsmack=false \
--disable-hibernate \ -Dgshadow=false \
--disable-ldconfig \ -Didn=false \
--disable-split-usr \ -Dnss-systemd=false \
--disable-tests \ -Dman=false \
--without-python \ -Dhtml=false \
--with-sysvinit-path= \ -Dbashcompletiondir=no \
--with-sysvrcnd-path= \ -Dzshcompletiondir=no \
--with-tty-gid=5 \ -Dkill-path=/usr/bin/kill \
--with-dbuspolicydir=/etc/dbus-1/system.d \ -Dkmod-path=/usr/bin/kmod \
--with-dbussessionservicedir=/usr/share/dbus-1/services \ -Dmount-path=/usr/bin/mount \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \ -Dumount-path=/usr/bin/umount"
--with-rootprefix=/usr \
--with-rootlibdir=/usr/lib \
--with-default-hierarchy=hybrid"
pre_build_target() {
# broken autoreconf
( cd $PKG_BUILD
intltoolize --force
)
}
pre_configure_target() { pre_configure_target() {
export CFLAGS="$CFLAGS -fno-schedule-insns -fno-schedule-insns2" 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() { post_makeinstall_target() {
# remove unneeded stuff # 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/systemd/system
rm -rf $INSTALL/etc/xdg rm -rf $INSTALL/etc/xdg
rm -rf $INSTALL/etc/X11 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/systemd-udev-hwdb-update.service
rm -rf $INSTALL/usr/lib/systemd/system/*.target.wants/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 # remove nspawn
rm -rf $INSTALL/usr/bin/systemd-nspawn rm -rf $INSTALL/usr/bin/systemd-nspawn
rm -rf $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service rm -rf $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service

50
packages/sysutils/systemd/patches/systemd-0001-move-etc-systemd-system-to-storage-.config-system.d.patch
View File

@ -1,35 +1,19 @@
From 56daac6a053159bbc5dc22d85c6ecd66b7369aae Mon Sep 17 00:00:00 2001 commit abce2c21148f981034acf143a3c12e5919949198
From: Stefan Saraev <stefan@saraev.ca> Author: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 19 Dec 2013 11:21:13 +0200 Date: Mon Oct 9 15:26:58 2017 -0700
Subject: [PATCH 2/8] move /etc/systemd/system to /storage/.config/system.d
--- move /etc/systemd/system to /storage/.config/system.d
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
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)

27
packages/sysutils/systemd/patches/systemd-0003-remove-xlocale.h.patch
View File

@ -1,27 +0,0 @@
From 0c50b8332092178378257c2de800fb6b6b4a8706 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 3 Jul 2017 08:45:04 -0700
Subject: [PATCH] parse-util: Do not include unneeded xlocale.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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 <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <xlocale.h>
#include "alloc-util.h"
#include "extract-word.h"
--
2.13.2