From dccd08de633300e474fac1fa14811abfa9462258 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 21 Oct 2021 11:03:48 +0200 Subject: systemd: update to 249 --- package/python3-jinja2/Makefile | 34 ++++++++++++++++++++++ package/systemd/Makefile | 18 +++++++----- .../systemd/patches/patch-units_getty@_service_m4 | 11 ------- .../patches/patch-units_serial-getty@_service_m4 | 11 ------- target/Makefile | 2 +- target/linux/config/Config.in.fsopts | 3 ++ 6 files changed, 48 insertions(+), 31 deletions(-) create mode 100644 package/python3-jinja2/Makefile delete mode 100644 package/systemd/patches/patch-units_getty@_service_m4 delete mode 100644 package/systemd/patches/patch-units_serial-getty@_service_m4 diff --git a/package/python3-jinja2/Makefile b/package/python3-jinja2/Makefile new file mode 100644 index 000000000..5cde4fc47 --- /dev/null +++ b/package/python3-jinja2/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= python3-jinja2 +PKG_VERSION:= 3.0.2 +PKG_RELEASE:= 1 +PKG_HASH:= 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 +PKG_DESCR:= fast, expressive, extensible templating engine +PKG_SECTION:= dev/tools +PKG_BUILDDEP:= python3-host +PKG_URL:= https://pypi.org/project/Jinja2/ +PKG_SITES:= https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110/ + +DISTFILES:= Jinja2-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/Jinja2-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON3_JINJA2,python3-jinja2,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python.mk + +HOST_STYLE:= manual + +python3-jinja2-hostinstall: + (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ + --prefix=$(STAGING_HOST_DIR)/usr) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk 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 diff --git a/target/Makefile b/target/Makefile index 3a063ef84..0ebae1de2 100644 --- a/target/Makefile +++ b/target/Makefile @@ -56,7 +56,7 @@ ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) $(BUILD_DIR)/.kernelconfig.board endif ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y) - $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \ + $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)" systemd.log_level=debug systemd.log_target=console#' \ $(BUILD_DIR)/.kernelconfig.board endif ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y) diff --git a/target/linux/config/Config.in.fsopts b/target/linux/config/Config.in.fsopts index d8afb57ce..ec2a5378f 100644 --- a/target/linux/config/Config.in.fsopts +++ b/target/linux/config/Config.in.fsopts @@ -9,4 +9,7 @@ config ADK_LINUX_KERNEL_INOTIFY_USER config ADK_LINUX_KERNEL_DNOTIFY bool "Enable DNOTIFY" +config ADK_LINUX_KERNEL_FANOTIFY + bool "Enable FANOTIFY" + endmenu -- cgit v1.2.3