Skip to content

systemd: bump 255.8 -> 260 (libreelec current) #2465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aenertia wants to merge 1 commit into
base: next
Choose a base branch
from
+81 −132
Open

systemd: bump 255.8 -> 260 (libreelec current) #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 42 additions & 46 deletions projects/ROCKNIX/packages/sysutils/systemd/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,59 +3,56 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="systemd"
PKG_VERSION="255.8"
PKG_VERSION="260"
PKG_LICENSE="LGPL2.1+"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/systemd/systemd/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux libidn2 Python3:host Jinja2:host pcre2 zstd libgcrypt openssl"
PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts."
PKG_BUILD_FLAGS="+lto"

PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Drootprefix=/usr \
-Dsplit-usr=false \
-Dsplit-bin=true \
-Ddefault-hierarchy=hybrid \
-Dtty-gid=5 \
-Dtests=false \
-Dseccomp=false \
-Dselinux=false \
-Dapparmor=false \
-Dpolkit=false \
-Dacl=false \
-Daudit=false \
-Dblkid=true \
-Dfdisk=false \
-Dkmod=true \
-Dpam=false \
-Dpwquality=false \
-Dmicrohttpd=false \
-Dlibcryptsetup=false \
-Dlibcurl=false \
-Dlibidn=false \
-Dlibidn2=true \
-Dlibiptc=false \
-Dqrencode=false \
-Dgcrypt=true \
-Dgnutls=false \
-Dopenssl=true \
-Dp11kit=false \
-Delfutils=false \
-Dzlib=false \
-Dbzip2=false \
-Dxz=false \
-Dlz4=false \
-Dxkbcommon=false \
-Dpcre2=true \
-Dglib=false \
-Ddbus=false \
-Dseccomp=disabled \
-Dselinux=disabled \
-Dapparmor=disabled \
-Dpolkit=disabled \
-Dacl=disabled \
-Daudit=disabled \
-Dblkid=enabled \
-Dfdisk=disabled \
-Dkmod=enabled \
-Dpam=disabled \
-Dpwquality=disabled \
-Dmicrohttpd=disabled \
-Dlibcryptsetup=disabled \
-Dlibcurl=disabled \
-Dlibidn2=enabled \
-Dqrencode=disabled \
-Dgcrypt=enabled \
-Dgnutls=disabled \
-Dopenssl=enabled \
-Dp11kit=disabled \
-Delfutils=disabled \
-Dzlib=disabled \
-Dbzip2=disabled \
-Dxz=disabled \
-Dlz4=disabled \
-Dzstd=disabled \
-Dxkbcommon=disabled \
-Dpcre2=enabled \
-Dglib=disabled \
-Ddbus=disabled \
-Ddefault-dnssec=no \
-Dimportd=false \
-Dremote=false \
-Dimportd=disabled \
-Dremote=disabled \
-Dutmp=true \
-Dhibernate=false \
-Denvironment-d=false \
-Dbinfmt=true \
-Drepart=false \
-Drepart=disabled \
-Dcoredump=false \
-Dresolve=true \
-Dlogind=true \
Expand All @@ -64,7 +61,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dmachined=false \
-Dportabled=false \
-Duserdb=false \
-Dhomed=false \
-Dhomed=disabled \
-Dnetworkd=false \
-Dtimedated=false \
-Dtimesyncd=true \
Expand All @@ -85,11 +82,11 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dgshadow=false \
-Didn=false \
-Dnss-myhostname=false \
-Dnss-mymachines=false \
-Dnss-mymachines=disabled \
-Dnss-resolve=true \
-Dnss-systemd=false \
-Dman=false \
-Dhtml=false \
-Dman=disabled \
-Dhtml=disabled \
-Dlink-udev-shared=true \
-Dlink-systemctl-shared=true \
-Dlink-networkd-shared=false \
Expand All @@ -98,9 +95,8 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dkmod-path=/usr/bin/kmod \
-Dmount-path=/usr/bin/mount \
-Dumount-path=/usr/bin/umount \
-Dversion-tag=${PKG_VERSION} \
-Dc_args=-D__counted_by\(x\)\= \
-Dcpp_args=-D__counted_by\(x\)\="
-Djournal-storage-default=auto \
-Dversion-tag=${PKG_VERSION}"
if [ -n "${BUILD_WITH_DEBUG}" ]
then
PKG_MESON_OPTS_TARGET+=" -Ddebug-tty=${DEBUG_TTY}"
Expand Down
16 changes: 8 additions & 8 deletions ...kages/sysutils/systemd/patches/systemd-0004-dont-show-machineid-error-on-first-boot.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/src/shared/machine-id-setup.c
+++ b/src/shared/machine-id-setup.c
@@ -129,7 +129,7 @@
"2) /etc/machine-id exists and is empty.\n"
"3) /etc/machine-id is missing and /etc is writable.\n");
else
- return log_error_errno(errno, "Cannot open %s: %m", etc_machine_id);
@@ -185,7 +185,7 @@
/* If that didn't work, convert it into a readable file */
fd = xopenat_full(inode_fd, /* path= */ NULL, O_RDONLY|O_CLOEXEC, XO_REGULAR, MODE_INVALID);
if (fd < 0)
- return log_error_errno(fd, "Cannot open '%s' in neither writable nor read-only mode: %m", etc_machine_id);
+ return 0;
}

writable = false;

log_debug("Successfully opened existing '%s' file in read-only mode.", etc_machine_id);
writable = false;
17 changes: 3 additions & 14 deletions ...KNIX/packages/sysutils/systemd/patches/systemd-0005-dont-provision-nonexistant-dirs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
--- a/tmpfiles.d/provision.conf
+++ b/tmpfiles.d/provision.conf
@@ -15,8 +15,3 @@

# Provision a /etc/hosts file from credentials.
f^ /etc/hosts - - - - network.hosts
-
-# Provision SSH key for root
-d- /root :0700 root :root -
-d- /root/.ssh :0700 root :root -
-f^ /root/.ssh/authorized_keys :0600 root :root - ssh.authorized_keys.root
--- a/tmpfiles.d/credstore.conf
+++ b/tmpfiles.d/credstore.conf
@@ -6,8 +6,3 @@
@@ -7,8 +7,3 @@
# (at your option) any later version.
# See tmpfiles.d(5) for details

# See tmpfiles.d(5) for details.
-
-d /etc/credstore 0700 root root
-d /etc/credstore.encrypted 0700 root root
Expand Down
25 changes: 5 additions & 20 deletions ...KNIX/packages/sysutils/systemd/patches/systemd-0200-persist-persistent-timer-stamps.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
From c1bcb16c35724404d30fab53017b757c886e9ab7 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 8 Jan 2018 13:46:51 +0000
Subject: [PATCH] timers: use a persistent filesystem for persistent timers

---
src/core/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/timer.c b/src/core/timer.c
index 03935ee..bfd5c02 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -144,11 +144,11 @@ static int timer_setup_persistent(Timer *t) {

@@ -140,11 +140,11 @@
if (MANAGER_IS_SYSTEM(UNIT(t)->manager)) {
- r = unit_require_mounts_for(UNIT(t), "/var/lib/systemd/timers", UNIT_DEPENDENCY_FILE);
+ r = unit_require_mounts_for(UNIT(t), "/storage/.cache/systemd/timers", UNIT_DEPENDENCY_FILE);

- r = unit_add_mounts_for(UNIT(t), "/var/lib/systemd/timers", UNIT_DEPENDENCY_FILE, UNIT_MOUNT_REQUIRES);
+ r = unit_add_mounts_for(UNIT(t), "/storage/.cache/systemd/timers", UNIT_DEPENDENCY_FILE, UNIT_MOUNT_REQUIRES);
if (r < 0)
return r;

- stamp_path = strjoin("/var/lib/systemd/timers/stamp-", UNIT(t)->id);
+ stamp_path = strjoin("/storage/.cache/systemd/timers/stamp-", UNIT(t)->id);
} else {
const char *e;

--
2.14.1

53 changes: 23 additions & 30 deletions ...IX/packages/sysutils/systemd/patches/systemd-0400-hide-useless-shutdown-log-message.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index b709078a..76ad0715 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -409,7 +409,7 @@ int main(int argc, char *argv[]) {
@@ -399,7 +399,7 @@
LOG_TARGET_KMSG))
bump_sysctl_printk_log_level(LOG_WARNING);

- init_watchdog();
+ /* init_watchdog(); */

/* Lock us into memory */
(void) mlockall(MCL_CURRENT|MCL_FUTURE);
@@ -443,7 +443,7 @@ int main(int argc, char *argv[]) {
@@ -434,7 +434,7 @@
for (;;) {
bool changed = false;

- (void) watchdog_ping();
+ /* (void) watchdog_ping(); */

/* Let's trim the cgroup tree on each iteration so that we leave an empty cgroup tree around,
* so that container managers get a nice notify event when we are down */
@@ -547,7 +547,7 @@ int main(int argc, char *argv[]) {

/* We're done with the watchdog. Note that the watchdog is explicitly not stopped here. It remains
* active to guard against any issues during the rest of the shutdown sequence. */
- watchdog_free_device();
+ /* watchdog_free_device(); */

arguments[0] = NULL; /* Filled in by execute_directories(), when needed */
arguments[1] = arg_verb;
@@ -573,13 +573,13 @@ int main(int argc, char *argv[]) {
@@ -541,7 +541,7 @@
* active to guard against any issues during the rest of the shutdown sequence. Note that we
* explicitly close the device with disarm=false here, before releasing the rest of the watchdog
* data. */
- watchdog_close(/* disarm= */ false);
+ /* watchdog_close(disarm false); */
watchdog_free_device();

const char *arguments[] = {
@@ -577,13 +577,13 @@
log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
}

- if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
+ /* if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
log_error("Unable to finalize remaining%s%s%s%s%s ignoring.",
Expand All @@ -42,32 +40,27 @@ index b709078a..76ad0715 100644
need_dm_detach ? " DM devices," : "",
- need_md_detach ? " MD devices," : "");
+ need_md_detach ? " MD devices," : ""); */

/* The kernel will automatically flush ATA disks and suchlike on reboot(), but the file systems need
* to be sync'ed explicitly in advance. So let's do this here, but not needlessly slow down
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 1a9b99d7..b5621515 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -331,7 +331,7 @@ static int umount_with_timeout(MountPoint *m, bool last_try) {
UMOUNT_NOFOLLOW | /* Don't follow symlinks: this should never happen unless our mount list was wrong */
@@ -331,7 +331,7 @@
UMOUNT_NOFOLLOW |
(m->umount_lazily ? MNT_DETACH : MNT_FORCE)));
if (r < 0) {
- log_full_errno(last_try ? LOG_ERR : LOG_INFO, r, "Failed to unmount %s: %m", m->path);
+ /* log_full_errno(last_try ? LOG_ERR : LOG_INFO, r, "Failed to unmount %s: %m", m->path); */

if (r == -EBUSY && last_try)
log_umount_blockers(m->path);
diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index 27be7bdf..f24587e7 100644
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -50,7 +50,7 @@ static int make_volatile(const char *path) {

@@ -50,7 +50,7 @@
r = umount_recursive(path, 0);
if (r < 0) {
- log_error_errno(r, "Failed to unmount %s: %m", path);
+ /* log_error_errno(r, "Failed to unmount %s: %m", path); */
goto finish_umount;
}

14 changes: 0 additions & 14 deletions projects/ROCKNIX/packages/sysutils/systemd/patches/systemd-ignore-sdcardfs-from-linux.patch
View file
Open in desktop

This file was deleted.