diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2021-10-21 11:03:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-10-22 19:40:14 +0200 |
| commit | dccd08de633300e474fac1fa14811abfa9462258 (patch) | |
| tree | 7d75e1c9212ca811ff1f4edbb5994dce0cdad606 /package/systemd | |
| parent | fda33fed0bc594f3e3f3201876edee9d9b3d1b80 (diff) | |
systemd: update to 249
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/Makefile | 18 | ||||
| -rw-r--r-- | package/systemd/patches/patch-units_getty@_service_m4 | 11 | ||||
| -rw-r--r-- | package/systemd/patches/patch-units_serial-getty@_service_m4 | 11 |
3 files changed, 10 insertions, 30 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 56460b7b8..2e38a7e8d 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= systemd -PKG_VERSION:= 246 -PKG_RELEASE:= 2 -PKG_HASH:= 4268bd88037806c61c5cd1c78d869f7f20bf7e7368c63916d47b5d1c3411bd6f +PKG_VERSION:= 249 +PKG_RELEASE:= 1 +PKG_HASH:= 174091ce5f2c02123f76d546622b14078097af105870086d18d55c1c2667d855 PKG_DESCR:= system and service manager PKG_SECTION:= base/init PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod PKG_BUILDDEP:= intltool-host gperf-host libcap util-linux -PKG_BUILDDEP+= gettext-host kmod meson-host ninja-host +PKG_BUILDDEP+= python3-host gettext-host kmod meson-host ninja-host +PKG_BUILDDEP+= python3-jinja2-host PKG_KDEPENDS:= inotify-user cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr -PKG_KDEPENDS+= uts-ns autofs4-fs +PKG_KDEPENDS+= uts-ns autofs4-fs fanotify PKG_NEEDS:= locale intl PKG_URL:= https://wiki.freedesktop.org/www/Software/systemd/ PKG_SITES:= https://github.com/systemd/systemd/archive/ @@ -64,7 +65,8 @@ MESON_FLAGS+= -Drootlibdir='/usr/lib' \ -Dacl=false \ -Daudit=false \ -Didn=false \ - -Dnss-systemd=false \ + -Dmode=release \ + -Dnss-systemd=true \ -Dresolve=false \ -Dseccomp=false \ -Dxkbcommon=false \ @@ -90,7 +92,7 @@ MESON_FLAGS+= -Drootlibdir='/usr/lib' \ -Dsmack=false \ -Dsysusers=false \ -Dhibernate=false \ - -Dpolkit=false \ + -Dpolkit=true \ -Dnetworkd=true \ -Dtimesyncd=true \ -Dtmpfiles=true \ @@ -148,6 +150,6 @@ systemd-install: $(IDIR_SYSTEMD)/etc/systemd/network (cd $(IDIR_SYSTEMD)/lib/systemd/system && ln -sf multi-user.target default.target) $(CP) $(WRKBUILD)/systemd $(IDIR_SYSTEMD)/usr/lib/systemd/ - mv $(IDIR_SYSTEMD)/lib/systemd/libsystemd-shared-246.so $(IDIR_SYSTEMD)/lib + mv $(IDIR_SYSTEMD)/lib/systemd/libsystemd-shared-249.so $(IDIR_SYSTEMD)/lib include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/systemd/patches/patch-units_getty@_service_m4 b/package/systemd/patches/patch-units_getty@_service_m4 deleted file mode 100644 index 27bf00933..000000000 --- a/package/systemd/patches/patch-units_getty@_service_m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- systemd-236.orig/units/getty@.service.m4 2017-12-14 23:09:57.000000000 +0100 -+++ systemd-236/units/getty@.service.m4 2018-01-01 18:46:35.149141863 +0100 -@@ -38,7 +38,7 @@ ConditionPathExists=/dev/tty0 - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 diff --git a/package/systemd/patches/patch-units_serial-getty@_service_m4 b/package/systemd/patches/patch-units_serial-getty@_service_m4 deleted file mode 100644 index 08d8f74ff..000000000 --- a/package/systemd/patches/patch-units_serial-getty@_service_m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- systemd-236.orig/units/serial-getty@.service.m4 2017-12-14 23:09:57.000000000 +0100 -+++ systemd-236/units/serial-getty@.service.m4 2018-01-01 18:46:35.157142052 +0100 -@@ -33,7 +33,7 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - UtmpIdentifier=%I |