From patchwork Thu Jul 21 15:19:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1659179 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LpbpL4VDtz9s09 for ; Fri, 22 Jul 2022 01:19:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 306B660EBB; Thu, 21 Jul 2022 15:19:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 306B660EBB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QZszEK_r624O; Thu, 21 Jul 2022 15:19:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 28CF4610C4; Thu, 21 Jul 2022 15:19:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 28CF4610C4 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 34F811BF404 for ; Thu, 21 Jul 2022 15:19:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1BE5160EE4 for ; Thu, 21 Jul 2022 15:19:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1BE5160EE4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rmE6VEJDvUNE for ; Thu, 21 Jul 2022 15:19:28 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0135960E33 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0135960E33 for ; Thu, 21 Jul 2022 15:19:27 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id m17so2458198wrw.7 for ; Thu, 21 Jul 2022 08:19:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7xaV3avL6gJLiNIVSEIdEUCSqYZCg3Q5raRYhMGlivY=; b=WJIEJXslvqmQEBCCY9b9YINqD0aWPUHcQUH5DxcZaWLJ9e25s4S9z5z+I+7qrvkNjW fqpEv2Saqa94M4bBOxgioQSyBf9l6UjtSqGndBIpJcHVE/zJFqWpgVyg8NMokgxG6x0U NYKS5BbwruxOu1N1YV+sFpnv9IANYumUaGlRgbVbq1wfx2BIVkAWdeIhkqDq2PLj3ls0 43vJZj9YUzskS3bnf0pf0oQ+Eott7isiwLhhrbdMUrD9G/TytaK39nH0URF3zydGN0/u yFtZWxV+4A5K27EIbtkkfnacy0cSVyKZ0qy3BBUyBUI/bJr/trNCiByBz8Lxq5RdL2uS Oslg== X-Gm-Message-State: AJIora8cYlGl9UxNrhAf96t4pTFPTrMbd5roUSL13fnY47mmrG6bdTzf Byhf5j1/XJH0DK08ZeU2hCL+mBsZnk8= X-Google-Smtp-Source: AGRyM1v6jdKvdnjSAkCuLby4XuRxGlRgqPfkIbMIaVWL7UcTWa2/LSU8/rK75fITSmzGwJTJk9SKaA== X-Received: by 2002:a5d:44d1:0:b0:21d:7471:2094 with SMTP id z17-20020a5d44d1000000b0021d74712094mr35376998wrr.374.1658416766044; Thu, 21 Jul 2022 08:19:26 -0700 (PDT) Received: from lano-work.. ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h6-20020a5d4fc6000000b0021d76a1b0e3sm2183059wrw.6.2022.07.21.08.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 08:19:25 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 21 Jul 2022 17:19:04 +0200 Message-Id: <20220721151907.212216-1-nolange79@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7xaV3avL6gJLiNIVSEIdEUCSqYZCg3Q5raRYhMGlivY=; b=RI9KP65n1MMtKZ8l7xr1Zp2utQRyeHLDcbrOFGV6IcBTLRZXPLOQdeZhUQW3w4CpqD z6SD4At0bzLmnlPQGO9sRBpTSqHlg6Cvp6L9zAUkdRLBWgDyK23k2JHmAtUZYTztwAVl BQ809149copTbnRR/U2LeDVcghLBNuUBcGhs6ZnX/Ssp8GBoPMqFYJl8SjUTg1sN5jA6 7TfjOJ0r1oGfMFuUUMiez8/BUNq8HBcKoI0nZnuMwrXS9C9yYY8i56krEeeG45Q2gvIZ tgwRmartCiFrYnLQXDvVU38nISbGZnxAgx0w/r3ctvwvwjhjCbE0QHoPUw12YyD+juyi Ttew== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RI9KP65n Subject: [Buildroot] [PATCH v3 1/3] package/systemd: bump to version 251.3 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: Norbert Lange , "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" LICENSES/README.md hash updated, this line got added in regards to files covered by CC0-1.0: > -config files and examples under /network Add config option for the new sysupdate feature. Remove upstreamed patch. Update options: set new options to their default, remove option not available anymore. Signed-off-by: Norbert Lange --- 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 --- ...define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch | 33 ------------------- package/systemd/Config.in | 12 +++++++ package/systemd/systemd.hash | 4 +-- package/systemd/systemd.mk | 13 ++++++-- 4 files changed, 25 insertions(+), 37 deletions(-) delete mode 100644 package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted file mode 100644 index 0934886acb..0000000000 --- a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 - diff --git a/package/systemd/Config.in b/package/systemd/Config.in index d5d88404de..9f1a778e59 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -475,6 +475,18 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 3572b25965..838ed13fd5 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz +sha256 11c9c3fcc13d689615dd2ea79161d1b992087cf1e2a23856d7d7ade0efbddc54 systemd-251.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -11,4 +11,4 @@ sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENS 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 177ff657698bc940f9888b7f69e5d734b0933c2859ea264fde8de1700cec40dd LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 46a4e8de2c..afee1cfc79 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.4 +SYSTEMD_VERSION = 251.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -62,6 +62,9 @@ SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ -Ddefault-hierarchy=unified \ + -Ddefault-compression=auto \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -472,6 +475,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management @@ -546,7 +555,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 @@ -797,6 +805,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ From patchwork Thu Jul 21 15:19:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1659181 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lpbpp598Lz9s09 for ; Fri, 22 Jul 2022 01:20:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C84C14119D; Thu, 21 Jul 2022 15:20:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C84C14119D 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 46va9BPHdT0Y; Thu, 21 Jul 2022 15:20:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C64CE41198; Thu, 21 Jul 2022 15:19:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C64CE41198 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1C3661BF404 for ; Thu, 21 Jul 2022 15:19:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8E3FB60E33 for ; Thu, 21 Jul 2022 15:19:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8E3FB60E33 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17_JhkF7bgkQ for ; Thu, 21 Jul 2022 15:19:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9673E60EB3 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9673E60EB3 for ; Thu, 21 Jul 2022 15:19:29 +0000 (UTC) Received: by mail-wr1-x42c.google.com with SMTP id m17so2458285wrw.7 for ; Thu, 21 Jul 2022 08:19:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pNU+4CFefv06m5Omgp2t1hcYWvI3Q/wUK3y4jL2iUB4=; b=I8dbLRS1xuVVfs5lfN3vNlxLcrryuRpn82hUuPfQ7TQxsBuYkY8DAFGdSdm4bZjs8n 7BEQwSjwvf0e+6x2iAG+kJwb2QOTTrLPDojNKjGixsPq9vz4BROUON1+rRiN38JFN5ro YTvdNDczHmvo/0xkBKCKHao68RBsThDyQuzVNZejc3SMJ7utuSPPkIqxUeMNLL+zD+sU rv08j5kh0DcDJhKMqmyk9k/pSxEjkRiXBfi3XMk5NWJtxmjLlAB8YtvpYz+/7zV54P/L S7HButgAfnjfqhJR/JAt73Df/wXatEhnnO7T8/xpWou47PgOq7tRJ2dV3FeRms8Pg2hg cD2A== X-Gm-Message-State: AJIora8Xo9CwGnBoxnbl8ldBPi+wTn1yrqINjT49utGWp/Y4qeJ4VzW0 /u788fyI7NtejT40NZk+eBaA2NG+Dfk= X-Google-Smtp-Source: AGRyM1uh4qaVUCa2mdJVHXiiUcVXbZWf+M0AmW4hjJgdO6G+Wn8LryzIL0hnx5X+zREb0Ssl5cdugg== X-Received: by 2002:a5d:588b:0:b0:21d:a918:65a5 with SMTP id n11-20020a5d588b000000b0021da91865a5mr35784307wrf.210.1658416767428; Thu, 21 Jul 2022 08:19:27 -0700 (PDT) Received: from lano-work.. ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h6-20020a5d4fc6000000b0021d76a1b0e3sm2183059wrw.6.2022.07.21.08.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 08:19:27 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 21 Jul 2022 17:19:05 +0200 Message-Id: <20220721151907.212216-2-nolange79@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220721151907.212216-1-nolange79@gmail.com> References: <20220721151907.212216-1-nolange79@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pNU+4CFefv06m5Omgp2t1hcYWvI3Q/wUK3y4jL2iUB4=; b=Gazun5DJ/RxAOS908WwQEg5hR0Basn9FuWfoFjMXwXiePPoSTa1ux5I9A5+MTjqGwy fltpL6zHXCp5oQmP3DIRZafDVBsqvEpeYDMSI58RKLqDCji4rI0v4WKA83bbbRKdjqED lLNfvxc8yqqYpTHbliWmLSJppnj/WgcQjFDBSKic2o0R3KL+8h6fcx6v+S8PgGleaiBn gfJBLVcw2ZTE098fSwmqZMEpigolcBp6Al0krtqGoGjzgI+H5BQopi3LBL+zyFVILjoA 2cJ5v46fEOGZ1mT2/eDrIydHLlS7LurfDgAVw7pl91L6etXXl+CEYwtFklgZANTJmNQF g8zA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Gazun5DJ Subject: [Buildroot] [PATCH v3 2/3] package/systemd: allow empty systemd default target 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: Norbert Lange , "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Currently, we forcefully require that a default target be specified. However, systemd does install a default target, but it's not possible to just use that target. Allow the user to blank-out the config setting to not override whatever systemd installed and keep that. Signed-off-by: Norbert Lange --- v1->v2: * completely remove the hook if var is empty * adjusted commit message v2->v3: * v2 was broken, dint want to send it. now fixed/correct --- package/systemd/systemd.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index afee1cfc79..15eb4f4d3b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -578,17 +578,20 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif +ifneq ($(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)),) define SYSTEMD_INSTALL_INIT_HOOK ln -fs "$(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET))" \ $(TARGET_DIR)/usr/lib/systemd/system/default.target endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_INSTALL_INIT_HOOK +endif + define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS From patchwork Thu Jul 21 15:19:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1659180 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LpbpY4FMBz9s09 for ; Fri, 22 Jul 2022 01:19:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8A60C81B3E; Thu, 21 Jul 2022 15:19:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8A60C81B3E 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 J0_YiEWkr6YE; Thu, 21 Jul 2022 15:19:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id A40B881415; Thu, 21 Jul 2022 15:19:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A40B881415 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 293C51BF404 for ; Thu, 21 Jul 2022 15:19:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5917D60E33 for ; Thu, 21 Jul 2022 15:19:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5917D60E33 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kR1D9oK33Xhf for ; Thu, 21 Jul 2022 15:19:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A7A3A60EBB Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp3.osuosl.org (Postfix) with ESMTPS id A7A3A60EBB for ; Thu, 21 Jul 2022 15:19:30 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id bu1so2736418wrb.9 for ; Thu, 21 Jul 2022 08:19:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z0WDsguYZFrHmjA73lUt1lZ5LxoNUI1hw3raaY+9HRs=; b=SYTj4WfE6TBXcNpp2l/QpUK+g6PSuBQw29PR21PJbIn5vL6PACf2zSs9qj5oueXjeG 7LRRjldcGXJoSgL2QmYjnMq2LKRluYV1Ay887UnArCcQOCN029ypfIDr+ppmvFcFyOqr R8jC2MGoPYgZj1Mgw8PuybgzrjibmzCcswTpzPKXVygje5E7aa2Q+k/DawH2BTIW0CUa V2qZ4I4+QaCHGZqzzfisWKaYCrfYP0Af1oArxNyKqEhyXrT+hcWlaAeik03vUXBlByLw OIVr+FkKR75VkfSwGaS53AMRXLzEK+6DjIVUeTLv9C2iR0Ft/d+uNIVQ0AGHnVsj6NkG 7dhA== X-Gm-Message-State: AJIora8w5uUlpHkcKYv23N6MT8AMJBeBhF7hHUofnsXDb0HBufSaotu6 9iTaRSwPTdAnmIt/3W7Au+hmPQYobXc= X-Google-Smtp-Source: AGRyM1sgzfeI20yEbpHXx/qXwxhFTzAI9ZKTscpAps5QVVSaIhjRtvP7G8RjpyTMwN1d1n9JvQHK1g== X-Received: by 2002:a05:6000:1d98:b0:21b:aead:9b6c with SMTP id bk24-20020a0560001d9800b0021baead9b6cmr34908223wrb.531.1658416768814; Thu, 21 Jul 2022 08:19:28 -0700 (PDT) Received: from lano-work.. ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h6-20020a5d4fc6000000b0021d76a1b0e3sm2183059wrw.6.2022.07.21.08.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 08:19:28 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 21 Jul 2022 17:19:06 +0200 Message-Id: <20220721151907.212216-3-nolange79@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220721151907.212216-1-nolange79@gmail.com> References: <20220721151907.212216-1-nolange79@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z0WDsguYZFrHmjA73lUt1lZ5LxoNUI1hw3raaY+9HRs=; b=INU10zR2mJGZXjiyICkzE9+sYjA3cUqljxrlrz7NY8JWlt9OETbsGBSFr7ZXCzxHxK yDR1ldXtcQiz+7MoWnJfjf44wtai2+A8SwN1VXXEtndc1+wziQbnvR0Yy9j0wrxJMmj1 4JolqWXX+dlsZ0tjEAPoMf2wR+JsnsnzyqE7uUoqovVhoGeVDBQGh9Gs+bPvEhjXsPW7 YfPz/DdoLn4B7Qw0Ujw5+K5wvTUDOeQy9t8ndaaB6xqK3HtiPzBUW1iHCQs4F3BaEhZ+ PsjjFSSHsEgA+CwCdETe3JQYAne+/++VCAVtPzSyGIy7nhbgOAKP+1ApY//AX5aS/qIO lkPQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=INU10zR2 Subject: [Buildroot] [PATCH v3 3/3] package/systemd: allow package to be used without init system 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: Norbert Lange , "Yann E. MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Allow systemd to be built as normal package, this is usefull for repeated rebuilds. There doesnt seem to be a technical reason to disallow it. Signed-off-by: Norbert Lange --- package/systemd/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f1a778e59..e0f5dbce0d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" - depends on BR2_INIT_SYSTEMD depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS # kmod