From patchwork Sun Jan 15 11:48:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1726689 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nvtjm54HQz23fk for ; Sun, 15 Jan 2023 22:49:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B546D81E38; Sun, 15 Jan 2023 11:49:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B546D81E38 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N2qsCXscesjD; Sun, 15 Jan 2023 11:49:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id A564981CA3; Sun, 15 Jan 2023 11:49:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A564981CA3 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9B4AD1BF29F for ; Sun, 15 Jan 2023 11:49:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 76D1E40640 for ; Sun, 15 Jan 2023 11:49:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 76D1E40640 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PDWcuCTQdN0L for ; Sun, 15 Jan 2023 11:49:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3B1A2400A4 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by smtp2.osuosl.org (Postfix) with ESMTPS id 3B1A2400A4 for ; Sun, 15 Jan 2023 11:49:26 +0000 (UTC) Received: by mail-ed1-x536.google.com with SMTP id v10so36010061edi.8 for ; Sun, 15 Jan 2023 03:49:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EUfJjvwvuzMK9iEsc2KEy268PzxZLdoHgYSsDGDtIZA=; b=p+T8ZtvdWAQ5EoWLBCgOfGgaVVY4mGzbUAuDKoyqLlgpXBkJi7CnLPqpeWZRghisQJ R1RmcjswFsFyeTrbGqVHcEv4Dz0aPyjPEKcWKBkoTCbcETyC+WjLTOB9UVexPUE7RPnr 6mJ7bH9g1A/BTQvyhZ67RyurWIcJi5uSRon/DVzhH7vWNa7rbbzQWgIHZ1bzM0T4OG3U CbqiSfFXg5KlvvuCNHtMZWYNoFvOxUMdtPY4WiWVHifMUXs+HFRRThoTBnOKSiYsTByw RMQBsSphQ3pDV6Ehk90vp3YK1IP7IfwA9cSY2VJqUzoWMIqIfFfz8ohXHq5hTgJWNN2A Srqg== X-Gm-Message-State: AFqh2kquFwoyoh7YKl0ctv12wNIb/3gDlMjN7f04PCnNgLIgIWf+UMoP agPzQF1aYtC0Y3HGLeUFnG11Lbw+JpQ= X-Google-Smtp-Source: AMrXdXuqk5PlEt2E0P/mQ0e4fBfQoP0d113f2QvzmloLn2glMOS1NlYl97TRd4vjmD2H0BD/TRKL+g== X-Received: by 2002:a05:6402:3888:b0:49d:6ebe:e9dc with SMTP id fd8-20020a056402388800b0049d6ebee9dcmr5193366edb.25.1673783364239; Sun, 15 Jan 2023 03:49:24 -0800 (PST) Received: from debian-noppl.. (84-113-221-34.cable.dynamic.surfer.at. [84.113.221.34]) by smtp.gmail.com with ESMTPSA id f6-20020a056402150600b0049622a61f8fsm10351880edw.30.2023.01.15.03.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 03:49:23 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Sun, 15 Jan 2023 12:48:36 +0100 Message-Id: <20230115114840.9027-1-nolange79@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EUfJjvwvuzMK9iEsc2KEy268PzxZLdoHgYSsDGDtIZA=; b=HMQjFmDmboSK2bt8+UrlptLkaEZQe4clMPfJLyA++jEWbSyYpafJdgZkO7ipF89wWL u4RA/iII8C9d9zHFbXH8a1v2adZfR+k72T+MUM9QY5hUIIO11A9q7RSdvszlca5RUnzD z3dP1hf9RU2OEiNKE9VLNDvoAeIRE/qDywiIMOCoj7sO01PwknI1aINB5aDN5hwPQp/p vwUjf8UEEveekPDop5WMAMpbh3TaDirYpy1vc7BHE42rg4i9OO+xHZuvEwyjbiLPtrzt x5PhhRxIjGKWP9GcDOthF8yClTuDU3OMQH+dCq6b839I2tHUW31KkuX0sl3eEQ2SatK2 p7tg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=HMQjFmDm Subject: [Buildroot] [PATCH v8 1/4] package/systemd: bump to version 252.4 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard , "Yann E . MORIN" , Sen Hastings , Norbert Lange Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Following files changed *license* from CC0-1.0 to MIT-0: - src/systemctl/systemd-sysv-install.SKELETON - config files - examples under /network The file LICENSES/MIT-0.txt has been added for this reason, hashes added, corrected for LICENSES/README.md. Kernel version 3.15 is now the bare minimum, but only version 4.15 and higher are fully supported and tested: - bump kernel header dependencies - correct kconfig description - improvements to make the kconfig description better reflect the information from the README Remove upstreamed patch. Set new options to their default, remove -Defi-cc option. Set -Ddbus=false to ensure dbus dependency is runtime only. Set -Ddbus-interfaces-dir=no as interface XML file generation is not supported when cross compiling. Set -Ddefault-user-shell=/bin/sh to the always available shell. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard --- v7->v8: * update to 252.4 v6->v7: * update to 252.1 * compare changes in licenses to 250.4 * update systemd description in kconfig with required and recommended kernel * split patch v5->v6: * update to 251.4 v4->v5: * fix dnssec changes, use James' solution v2->v4: * Bump kernel header dependency to 3.15 * Inherit changes from James' version bump patch (following) * (Force) disable compile time dbus dependencies * set default-dnssec to allow-downgrade v1->v2: * note about changed LICENSES/README.md * always set default-user-shell to /bin/sh * always set default-locale to C-UTF-8 * fix typos in commit message --- License diff for illustration --- systemd-stable-250.4/LICENSES/README.md +++ systemd-stable-252.1/LICENSES/README.md @@ -45,9 +45,11 @@ * the following sources are licensed under the **CC0-1.0** license: - src/basic/siphash24.c - src/basic/siphash24.h - - src/systemctl/systemd-sysv-install.SKELETON - tools/check-includes.pl + * the following sources are licensed under the **MIT-0** license: - all examples under man/ + - src/systemctl/systemd-sysv-install.SKELETON + - config files and examples under /network * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): - src/basic/MurmurHash2.c - src/basic/MurmurHash2.h package/systemd: 252.4 --- package/systemd/Config.in | 12 +++++++++--- package/systemd/systemd.hash | 5 +++-- package/systemd/systemd.mk | 16 ++++++++++++++-- system/Config.in | 6 +++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 45a9e2d644..f35305c0be 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3b98566f32..00c08edcd9 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 638a2fc78828765fc97bc73f428205b6dc1d359149b6c6bfe4d2a649cba2cca8 systemd-250.8.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 LICENSES/LGPL-2.0-or-later.txt sha256 5bcef4fedbfc08776630e65d5d0d074dd31208037eddb167ca46a9ec4f737764 LICENSES/Linux-syscall-note.txt sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENSES/lookup3-public-domain.txt +sha256 8a6fc0879cecc0b96bf4c08159b9d733bf0f15fcf32879aec98c4ffd05424554 LICENSES/MIT-0.txt sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b96873b73f..b0597f9bb4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.8 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,6 +41,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -82,6 +91,7 @@ SYSTEMD_CONF_OPTS += \ -Dsulogin-path=/usr/sbin/sulogin \ -Dsystem-gid-max=999 \ -Dsystem-uid-max=999 \ + -Dsysupdate=false \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ -Dtelinit-path= \ @@ -553,7 +563,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -793,6 +802,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -801,6 +812,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ diff --git a/system/Config.in b/system/Config.in index 806a747315..232bdfe763 100644 --- a/system/Config.in +++ b/system/Config.in @@ -125,19 +125,19 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5