From patchwork Mon Jun 15 07:20:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309254 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=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=N/mN+WY8; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljS33QWcz9sQx for ; Mon, 15 Jun 2020 17:21:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6A79886FE9; Mon, 15 Jun 2020 07:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IVvap0BweldK; Mon, 15 Jun 2020 07:21:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CA81F86FFD; Mon, 15 Jun 2020 07:21:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0ADA31BF4E7 for ; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 07ACC8815A for ; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hDP7ZAYEL3MG for ; Mon, 15 Jun 2020 07:21:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id D4D0D87DC5 for ; Mon, 15 Jun 2020 07:21:13 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id y20so13664273wmi.2 for ; Mon, 15 Jun 2020 00:21:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/iSPBCtymVbkxRdFDNbzx6w0AFdwP3XYqKogLjhwHU=; b=N/mN+WY8FZ1TmaxppgAq4no+Mj55ZBot2RMaElhtAxQqVo1KsNeLPTlkije8iKmI4h sKmvAZGVxm4SYO9xftw0m9AI3acauJIsbbVhhWcO6gL9M92gOvsyaCrXCihD83w/Y9ux kSb7oqbQ1z/8AbWBi5EJOrOJdnY4a+IzPZVpCltXfKjX7zsohEYOEr/aOkYFElwunuC8 ybzBNpLWXc1z4F37hS9CK+qBPrTgUblUdwwGHxXCRMaECDE2EAPYulvtcSgp0cuPZ1QP jAWsibMEPxyqs90pclcWZ3aCzkfmfOHDoTZQPSB7EYUuBIyJyX7l8wVQUDT6/dpBvEIQ QwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W/iSPBCtymVbkxRdFDNbzx6w0AFdwP3XYqKogLjhwHU=; b=pPiCaIJLnUuYlJVOecDbyvPMxJp5hEKqDyKjMWzoWCUzgJEj01RKbKXfuqHx8cjKfw d2cPbUVTZNbv7xpzar6rtqGyf+1eTP0mC9ZYfkmyip64QU1bzgeRVBdTFBXV+IfA2kY/ q0euEyQdJ4YMKzuT/9y0uIaK/kJwoqKTH8JtsQb7AXdmihY5dRcITDQG4T5mUP15rE8+ n+hhBELXBXuY60yB2Ks5LxTL7FYSwdt1l/50UP+AKOMmtqb5vdsvPEX1Qjv68IZWm1AL Ij4GgyAp0rWe4m+1BSmJNJd6+09V5X0K+TPwNcxW2VwhBPEUQgF3rNPxNRSlM54HICSw l1Ng== X-Gm-Message-State: AOAM531roQqak9wqwQxIf9DJnjommUeGX/KU/FSsOBONLTIePoLqAlvs IeryO0KUMoi9mmzU/UttXMv7/L8ncu5juw== X-Google-Smtp-Source: ABdhPJzqDwXiYAYjYZZyS2sP2IrlrjHcf1TdJl7e5ksbUA4xnNnoI2tSDnMDFlpP+Nrix1dXYUQZeg== X-Received: by 2002:a1c:f204:: with SMTP id s4mr12236074wmc.159.1592205672005; Mon, 15 Jun 2020 00:21:12 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:11 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:41 +0200 Message-Id: <20200615072055.2083-2-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 01/14] package/systemd: configure nss plugins in nsswitch.conf X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This adds configuration of the nsswitch.conf file, it does so by pathing the template provided by systemd. The template is fully populated, the services that are not available are removed. If the plugin nss-compat is not available, the entries will be replaced with nss-files. nss-systemd is used for the DynamicUser features, which is a defacto necessity for systemd. It handles transient users/groups without touching the /etc/{passwd,group} files on disk. nss-myhostname allows resolving the hostname, again without touching files in /etc. Enabling this feature requires configuring the plugin. nss-resolve is part of resolved, and required for consistent dns lookups. nss-mymachines adds name resolution from containers. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e61cec80f0..cf6c0f9576 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -472,7 +472,23 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef +define SYSTEMD_NSSCONFIG_HOOK + [ -r "$$(find $(TARGET_DIR)/usr/lib -name libnss_compat.so.*)" ] || \ + sed 's,\bcompat\b,files,g' -i $(TARGET_DIR)/usr/share/factory/etc/nsswitch.conf + [ "$(BR2_PACKAGE_SYSTEMD_RESOLVED)" = "y" ] || \ + sed -e 's,\bresolve[[:space:]][[:space:]]*\[[^]]*\][[:space:]]*,,g' \ + -e 's,\bresolve\b[[:space:]]*,,g' -i $(TARGET_DIR)/usr/share/factory/etc/nsswitch.conf + [ "$(BR2_PACKAGE_SYSTEMD_MYHOSTNAME)" = "y" ] || \ + sed -e 's,\bmyhostname[[:space:]][[:space:]]*\[[^]]*\][[:space:]]*,,g' \ + -e 's,\bmyhostname\b[[:space:]]*,,g' -i $(TARGET_DIR)/usr/share/factory/etc/nsswitch.conf + [ "$(BR2_PACKAGE_SYSTEMD_MACHINED)" = "y" ] || \ + sed -e 's,\bmymachines[[:space:]][[:space:]]*\[[^]]*\][[:space:]]*,,g' \ + -e 's,\bmymachines\b[[:space:]]*,,g' -i $(TARGET_DIR)/usr/share/factory/etc/nsswitch.conf + install -m644 $(TARGET_DIR)/usr/share/factory/etc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf +endef + SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ + SYSTEMD_NSSCONFIG_HOOK \ SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK From patchwork Mon Jun 15 07:20:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309256 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QTlMgcW0; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljS63Synz9sQx for ; Mon, 15 Jun 2020 17:21:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 33D698829F; Mon, 15 Jun 2020 07:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0ZHRtWe06LbI; Mon, 15 Jun 2020 07:21:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BF14F8821D; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0C9171BF4E7 for ; Mon, 15 Jun 2020 07:21:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 07992203C2 for ; Mon, 15 Jun 2020 07:21:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tB1Or5jaH-z4 for ; Mon, 15 Jun 2020 07:21:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id 3D79D2001F for ; Mon, 15 Jun 2020 07:21:15 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id l26so13502566wme.3 for ; Mon, 15 Jun 2020 00:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gic9TmVzDqU2WypZED8mUFJ9RpJLsyGc5E6d882koFg=; b=QTlMgcW0OFI9CCjC8l3RjhlFUq3tzQXJabROTzzAnPu9TQjqsoatYHLHGCifpdkJSo 7ibgt9zE2HU22KzhvPfHc43vUplBgrxChRiZVVI1+V6GhluQ3cL15Qfn/auHrZwbg42m hjt55+pSsmJnqKd8yI7jKSz1sFKX2hxGut20PhtfGPI8jOqod1lA8QXN5/Os8LQDS8VO KbCgj5w+SzfxRS92jIfleAHDaDpQx59G6WVCqlSudFjpUeUVqiduDSyy/ZzrqAsPE7lj yt9jHiOByuCCwX1xWzPdI6wKuoZz4jZSI5YYvm+izlN05qPUQcXdsJIcKc1Arwg8unfn rCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gic9TmVzDqU2WypZED8mUFJ9RpJLsyGc5E6d882koFg=; b=EK1xhPCvSoy9ghMJqCHyD/JDRIqc3I/NHsCwnF4qf6vo/MOy72gGTc5VPLbKpUkb7z IfsL1jXtAE+2qXjX09nx8OpJxS7AoUtNHcH2r+lpMNaazmauawrPPXz3W8OIMef2F5Yk IhwFfqvuF3SGqBQvT5YbLsU1A6niK1mu0c2lhVrHfM1SEo0Wy9oA3wQWhMlbatv4fJ2f w0Z1QEj/gC5NSaErvc+krAB+TENqMB/G0SWl+pFXecs0VKW+4n8Ke9FCPdxzNUxKjfy+ fTOlgVyys1sP0Q5uHFokxiG8/1400gfcKcH3PDOL+N4jYczMNwpZcT3TAcapFp6I5EeV ZjqQ== X-Gm-Message-State: AOAM532kP7dUere4sUdKiCcAQNZmJQ2WtEIJ3/39S7nEoD0MYD4Hwy8t 0lo42CvTL5R6CSD0NkOZSH5fpVp05pbCtw== X-Google-Smtp-Source: ABdhPJyyGbavVP2ki6iwSGOJLWRXYUS9mFxP31zZm2Q362vEgOzBERYzXe4NneNHm1iO6gx4awm5tA== X-Received: by 2002:a05:600c:2294:: with SMTP id 20mr12082310wmf.51.1592205673373; Mon, 15 Jun 2020 00:21:13 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:12 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:42 +0200 Message-Id: <20200615072055.2083-3-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 02/14] package/systemd: remove unused user accounts X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since V235 the "gateway" and "upload" services use DynamicUsers, requiring no entries in /etc/passwd. This functionality requires nss-systemd, which is always enabled in buildroot. The "bus-proxy" user was removed in V230. Signed-off-by: Norbert Lange Reviewed-by: Jérémy Rosen --- package/systemd/systemd.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cf6c0f9576..8e82d8afa7 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -502,10 +502,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal - - render -1 * - - - DRI rendering nodes - - kvm -1 * - - - kvm nodes - systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus - systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote - systemd-journal-upload -1 systemd-journal-upload -1 * - - - Journal Upload $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) From patchwork Mon Jun 15 07:20:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309255 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=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JAax6MJE; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljS53h6Sz9sRf for ; Mon, 15 Jun 2020 17:21:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 203938701E; Mon, 15 Jun 2020 07:21:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cXFn0Vbn1PRE; Mon, 15 Jun 2020 07:21:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BC41187060; Mon, 15 Jun 2020 07:21:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 53BDF1BF4E7 for ; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 507558806D for ; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4+gF0cEM6sHy for ; Mon, 15 Jun 2020 07:21:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9592887BC0 for ; Mon, 15 Jun 2020 07:21:16 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id q25so13686932wmj.0 for ; Mon, 15 Jun 2020 00:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KGAo8z77ITNNuzkxA+EOIUQXeUMpSsLXEIPd9G4ouN8=; b=JAax6MJEJRScyDwGuHDVeWYVwIvZQnJBMP1oC2UqocRqtumXXzZA9yXVhPZhb0qe0r kR8X1wSojBG2OHP8JgkNMOONSZRAl9CJuibITlou5W6y7ZMrp03Um4o2eGDgNU9V33yv oEmwy0psB0ptocvxxbt48Tr9Buap07Voa0MkstZhzSDv1S3TUNqAQCtjfWj+tGyfcEw5 e/UuCopv7jOuHsbRE22UQB8IGMEAbIPlFyXpTMTViXjOX2NLwyt5i+IIvFg+mBC95q+c kTkKTUQELUvIrTL6y7+IUOXZIJ2uZ6/QyDKCT1Gt5sm7cm98NPd80uvDUKVsMD3QCUJF dR1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KGAo8z77ITNNuzkxA+EOIUQXeUMpSsLXEIPd9G4ouN8=; b=NuB1WUUmPKikKS3DCzVfWKA+zb4gUXgwqMR0Dr/siN4a2XE4YReG/+51BetL2DfMmv 7lPDuhBFO6j5gjVoiddxJCUIHHl+pUuCWyTAd5az+Kd4H3cmc6Sb1WD5IFG2VNFO4KRE b7S0D4nRJeennMySfyWof4uwREk5F8F0FLnUXxvrSU1NqOWxFOyhDtj7jEoKwSEniY8p cu4Ln+NWZdjzKW1BvSJOsH18+Gojp0zFz8nXqFx5/Kkq9un/k8tdrUevA38jBP6+aeVW 1muXPpGH1P7vBjcA0/o43an0uSYcyH5boyiylZMjlJnq2sw/H7cu10/eys+yOZ11WVX9 k2AQ== X-Gm-Message-State: AOAM533A82EyZ/B0uEzKR6YUppVh9ALt2Z5KDhBeCvW0ePcdzcFmVTMx qDGU7fqtc6M7BwS/N9MTbwVVOMWydOLLWw== X-Google-Smtp-Source: ABdhPJyEHdczyAfHwfKT0X5GDIshD4Wu6Wc+MfVlZXjoII8QV/zR1dCofFWQj31S+o6o9v1UoGWFNQ== X-Received: by 2002:a1c:bbd6:: with SMTP id l205mr11905631wmf.147.1592205674771; Mon, 15 Jun 2020 00:21:14 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:14 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:43 +0200 Message-Id: <20200615072055.2083-4-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 03/14] package/systemd: create "remote" user if the feature is enabled X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Norbert Lange Reviewed-by: Jérémy Rosen --- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 8e82d8afa7..ead4e70f95 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -214,6 +214,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) SYSTEMD_CONF_OPTS += -Dremote=true +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote else SYSTEMD_CONF_OPTS += -Dremote=false endif @@ -502,7 +503,7 @@ define SYSTEMD_USERS - - systemd-journal -1 * - - - Journal - - render -1 * - - - DRI rendering nodes - - kvm -1 * - - - kvm nodes - systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote + $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER) $(SYSTEMD_RESOLVED_USER) From patchwork Mon Jun 15 07:20:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309258 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HVE++vCb; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSB6BB8z9sQx for ; Mon, 15 Jun 2020 17:21:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DBAC288F2E; Mon, 15 Jun 2020 07:21:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jqZ70BOT6lNg; Mon, 15 Jun 2020 07:21:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DAE1887F53; Mon, 15 Jun 2020 07:21:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 987C21BF4E7 for ; Mon, 15 Jun 2020 07:21:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9171086FE9 for ; Mon, 15 Jun 2020 07:21:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kghqwkDnIlmB for ; Mon, 15 Jun 2020 07:21:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EAC7786F9A for ; Mon, 15 Jun 2020 07:21:17 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id b82so4986601wmb.1 for ; Mon, 15 Jun 2020 00:21:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hAZZh3qSoZfaVJ6qhZ6gwJE+nEticj8w7+lYfqrzSos=; b=HVE++vCbxVSLIpxGUyXL5g1DtQVKC3kRSkK1MJcIhZYOpnQGXrewt+D0Ac8AjOdGWi AFuypRP4XZsCVw1zwZ6Rp/0sQkb+nchvCg+syLNGNlb5nzPgFioHyvqpKDmQKwWuCJB3 PJ3HHImtGe12Gkhqff4kcj+cld1YRX9EDyW7V53+xNhDK9n9iwUNLNno7k7Z2FoUb5/R HnBBaMJM+/6gkJeBB6Z59RNjhq9R9AxAEKWUrmROWvyLgJn0MbYwwOh/VWiiDKsQoriu nFpME7RxJqSG0R7j9Vn/5NSGC5gs7NTfVwRpe31R/iYYRcW4/9B/V9sJb1PBP+pgQq/B aloQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hAZZh3qSoZfaVJ6qhZ6gwJE+nEticj8w7+lYfqrzSos=; b=Ibg2Ag5b6lHIcrFr3DSNsmqhR+T8pguS8DDWfrT7FUTk3W9KtCfbinVPVpuQNdCRop GT1VyKainaCaSCmM4C2nedBwp7niGCg1oQ47jbvsJnLB/eCuMg1WSkscHZ5EhaaHGHlh mdQy9Utl8LXFmGPD2A0i3PFnV8oFFL20ZVl/RRT7Lg6bOruvumQCHGo6y9yB/8geyN8t kG9nyULiqlb86xf8b/Z0X+VHM2qLLCAw3Qx4d9fXxTc9u+bxZSKcdFgvgZlNjA2qxlOo zZ9yOFzZyRWwimvTaxbKqGcKtml1zTIXXU6n3iovguetGs02HFNJI3DSBKWIX+LQjb7E +Bfg== X-Gm-Message-State: AOAM530/EZ0gYUkGeinKUHqY4IMXZkzh8PHU+5y0bhJIaRaFLPfVugfN Mdf5yiFjUon1wM/vOqWWpwb/4j+OFs9ElQ== X-Google-Smtp-Source: ABdhPJxh0E2wwUTFdCKfo4hJ94hszKr51JQPj8kkI5sRWmq0ps8YjLcEuzeGxe6aC2ObPLmAWjO18A== X-Received: by 2002:a1c:740e:: with SMTP id p14mr12281072wmc.155.1592205676297; Mon, 15 Jun 2020 00:21:16 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:15 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:44 +0200 Message-Id: <20200615072055.2083-5-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 04/14] package/systemd: cosmetic rearrange list of users X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Group the udev users first, to make clear which software requires them. Signed-off-by: Norbert Lange Reviewed-by: Jérémy Rosen --- package/systemd/systemd.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ead4e70f95..6629c933cd 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -499,10 +499,12 @@ define SYSTEMD_INSTALL_IMAGES_CMDS endef define SYSTEMD_USERS + # udev user groups - - input -1 * - - - Input device group - - - systemd-journal -1 * - - - Journal - - render -1 * - - - DRI rendering nodes - - kvm -1 * - - - kvm nodes + # systemd user groups + - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER) From patchwork Mon Jun 15 07:20:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309257 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=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JFDZSpf7; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljS84F5Sz9sRf for ; Mon, 15 Jun 2020 17:21:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F3BC087BC0; Mon, 15 Jun 2020 07:21:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QnA9R-b5Kbzi; Mon, 15 Jun 2020 07:21:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4EB2C8806D; Mon, 15 Jun 2020 07:21:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2EAF31BF4E7 for ; Mon, 15 Jun 2020 07:21:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2C1148701E for ; Mon, 15 Jun 2020 07:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o2_GH3UqkrHf for ; Mon, 15 Jun 2020 07:21:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6EBD986F9A for ; Mon, 15 Jun 2020 07:21:19 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id r9so13513169wmh.2 for ; Mon, 15 Jun 2020 00:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mBBwMjZhfX6l0o/IVVK918wq48CjtidBuumsnzLbtWE=; b=JFDZSpf7eAJXj4kYz42bNGiYK8FF6b8uUQjBJxO9uHrUmJO+iY2jWjWfotMt5eo+CB f5nThyMA+mz5dFIj5Qz0c15he7fbz2L5olXp72YAn3wH0BjMDvv8nt4r5h/ofdufu1OX 4sizF2jWzB7MxlSGUedwZJfDxMAvooe4i3H0gh3gnT3bce0gwxzXIjdPmXmk5sPqK4Z1 izTpmq3EqrEs8SQZhRpzEBZVQ+S6vTcaAtZ9aQXjdG2yjU0uFWqtK9W7ABeFMq7Adydr ZNFOyBSJ2ultmkJm5LmDNwwIhp+S6z5L7X+pUJW28sSfaTXr5PVmtETrOEpvB8xVoBjJ wu8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mBBwMjZhfX6l0o/IVVK918wq48CjtidBuumsnzLbtWE=; b=DoS4x0uE5N3DuKCkckA5PiNkti31w3QrItBAYpSuAEnekZj9CeTt4ZxXOyT+kNkLAb Wi/58ZvahrmI14D6JbUHkihgs2XZHpymgqPfc2X32LQQG+u6ILAAuTJq/t/z8grmI8jj CYcnFG9FD0LBFeqyitpHGlMXSOGgvHcX92VcnDD7Jk3Lc8ma6m2xWJGAHVM9w+uZ+AxM ycVPh7//WCijf9NzfDXULwPHL9nVSIn/JJ6+wq7UIyiB2UM9jvb6zIbsiBqYh8SYH+HD PPNXdE3JCR/pTftfIE2EGdvQJCdeOFTYYgcRzj3Zb2S/8URBIbu9RO14g25xCWAixB8h hqgQ== X-Gm-Message-State: AOAM531J8ASvREtfg4ty+1KtvSEzJab52C1/Pyk7rnwkeXhxOf9Co7ql hTdVYe2bXPOKk4NEHUkLOhFLTHaR8vg2bg== X-Google-Smtp-Source: ABdhPJw2pBkeV4GjZWNctRDTLVtCtKqqVlr0RXHYcbwnvnWAhEV1GszxXwbFo6ugQNuJfAQl7F4GVA== X-Received: by 2002:a1c:64d5:: with SMTP id y204mr12187789wmb.131.1592205677719; Mon, 15 Jun 2020 00:21:17 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:17 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:45 +0200 Message-Id: <20200615072055.2083-6-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 05/14] package/systemd: sync user comments to upstream X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The necessary system users are documented in the projects README. Description is matched to the ones in the upstream sysusers.d files. Remove homedirectory (upstream doesnt care either). Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6629c933cd..2cc71ee667 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -214,7 +214,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) SYSTEMD_CONF_OPTS += -Dremote=true -SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else SYSTEMD_CONF_OPTS += -Dremote=false endif @@ -358,7 +358,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper +SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -378,7 +378,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager +SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -397,7 +397,7 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK $(TARGET_DIR)/etc/resolv.conf endef SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager +SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver else SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false endif @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization +SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif From patchwork Mon Jun 15 07:20:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309260 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=J+X6dE4y; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSH0sfYz9sRf for ; Mon, 15 Jun 2020 17:21:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6A17D8815A; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2HGBGhSmXr19; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A7C92882F4; Mon, 15 Jun 2020 07:21:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6473B1BF4E7 for ; Mon, 15 Jun 2020 07:21:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 60E7C8806D for ; Mon, 15 Jun 2020 07:21:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xNaQY8FSGCG8 for ; Mon, 15 Jun 2020 07:21:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by hemlock.osuosl.org (Postfix) with ESMTPS id BA9C087BC0 for ; Mon, 15 Jun 2020 07:21:20 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id g10so13487193wmh.4 for ; Mon, 15 Jun 2020 00:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RUsdlQl6t/Stk7DnPDpjaeIB/kZFt3kOVrqNSSxwU8I=; b=J+X6dE4yAClsz7Rh0KRZUCEJjIcT5TRfmOx+dU9UTcREHF62ZRvFBrOXI1OoCNT+BH HRpcfqI70ubrryyochCOR/G0RceZG2sz9AoJLA57HRKJ91pczt/PxneiqITke5kSWm6z /JVnhenuisrNwn+f9iKdUAipEuxvU/XItFM4boczOa+6aOsfmdbU5gGP5t6vtaK5j6I/ pC05AkkftzLBNlFk2uZv3pYJtsnNUlfOQX26Mbb1CBcXEbSgAhLGuRmPWhJQh8uJfuCy 4Dwm8EWbOLctlztzfEozFFZ1ExtlkJbvjkHSe46JOxaUHk0wcUhklI+xddmo74repwgv ulug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RUsdlQl6t/Stk7DnPDpjaeIB/kZFt3kOVrqNSSxwU8I=; b=LCskyag+wasmgwhKF6boxOj7W2+H2wL0RArX8DZyNIiixbBLBHnnGwH+LMJypXPsBI /fqliEyUpJg7AAIGRuzsD9Zu8pOfM00aKqjbTxQnCNtLEKy0MB0CiLbR4HmD4x2vGp3D XEOHuc61tAYXbkhdSdSQVH5qv9iWwp9/GT/3Q4uNKamY6Gb3BS9lPt5TN89MaTJpo/NM RV6zLPPFpdHQ/6jeP08TM+AjG4bl1LRidWMxUIyrYO29XVRrhdawrAEPwgmuQ8M7VEyc Il4CZ+Vj76lWolSGY/Po/41udWQFin8oA6MmNbRE4hQO4A1NMSgw7zcPvQqdBprzyK/N 3l4g== X-Gm-Message-State: AOAM531bxaDTAsO6gaMyoRTBf8G9tVH/ft2C7DPB+qf7yWk9iPyF5fsn 9KusJR2e2JSC7z6jREou0tt/EmGVfVM= X-Google-Smtp-Source: ABdhPJwNDhwZuTFeP7bcr69/8m8Ouur/c58iSV9pn4RctO7bRykQjmdC3qWO6AAjcFClcW9Cjz1Z7A== X-Received: by 2002:a1c:e90a:: with SMTP id q10mr12139062wmc.140.1592205679043; Mon, 15 Jun 2020 00:21:19 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:18 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:46 +0200 Message-Id: <20200615072055.2083-7-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 06/14] Makefile: Handle systemd catalogs in PURGE_LOCALES X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" journald supports localization with Catalog files with a naming scheme ..catalog. We want to purge them like other locales. Signed-off-by: Norbert Lange --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index ce1c08a6f6..dd4cc4c4c2 100644 --- a/Makefile +++ b/Makefile @@ -709,6 +709,14 @@ define PURGE_LOCALES fi \ done; \ done + for cfile in $(wildcard $(TARGET_DIR)/usr/lib/systemd/catalog/*.catalog); \ + do \ + basename=$${cfile##*/}; \ + basename=$${basename%.catalog}; \ + langext=$${basename#*.}; \ + [ "$$langext" != "$${basename}" ] || continue; \ + grep -qx "$${langext}" $(LOCALE_WHITELIST) || rm -f "$$cfile"; \ + done if [ -d $(TARGET_DIR)/usr/share/X11/locale ]; \ then \ for lang in $(LOCALE_NOPURGE); \ From patchwork Mon Jun 15 07:20:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309264 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=M/oEDGXD; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSM2LFpz9sRh for ; Mon, 15 Jun 2020 17:21:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C26B882B1; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pKyT5-eJKJVr; Mon, 15 Jun 2020 07:21:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0CA3988E2A; Mon, 15 Jun 2020 07:21:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C9F431BF4E7 for ; Mon, 15 Jun 2020 07:21:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC218203C2 for ; Mon, 15 Jun 2020 07:21:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zuAPbhxNlliB for ; Mon, 15 Jun 2020 07:21:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id 54C512001F for ; Mon, 15 Jun 2020 07:21:22 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id x6so15866201wrm.13 for ; Mon, 15 Jun 2020 00:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bu4FcPdj/JI8cQWgYBKXKFz+NUyZ2Q/TH+mjy010VlI=; b=M/oEDGXDAWE1bs+EPO6qmhsEIbiSH27iP3bhYXALEmZAurxIlcy6jVZU11Ig0cN0za YNhrzzdobrUikMtHz8ssdMQPRjX/wQcAX0qX9e9ng7hsMETqgETX/NOjdk5E4GCuRgZk LazCsdu9LB0ifERyzyZCgV2bQuGjTNzNlcgsOC2Nc8YbV8HTNkm/S1wR1Taz9lXNNoiK Vk5SXg641PyH19QcymD/nE/VwCVljHzJQfjHOiEyknrPowS5ZMU5ymJcwr4veDLiIN5K cE683BpajBOorN/UAkvsrW0rD4KowgSxWI4JM9ufZeTJAvTVKN+Tglll5nBzQUWan/cd TPjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bu4FcPdj/JI8cQWgYBKXKFz+NUyZ2Q/TH+mjy010VlI=; b=rnhVBuE3LTL/Eaw1ED7CJmdL27EDoCuBjMvq0q3YH9+cTR7zJINwsmGmYJkvBax0hX ocbp6WdsxbqLv8Kjmnj1JkFqACfS9wfoTPN9V/o7SO92yo045ka5VIAE9ImbHOHi2od8 lHE/LPdPPOeTKE2MsW+S7D/fUu60Mm19ribmJ4W5Dr9vHh/GhafwGUtMbwiqIHdm2A++ BF6jEJ+FQJjcgOUNpnqRnoPSCbjzkgXtf9KslUAIOrO0TPghBByiyMJ8dUgdm8LuwXJj fnBh2d9TPR0tEc8u7SlD89XQYnuLkAafODTJCtZstFDef5LCpWbTvn6xfYJMnrnaeTjf oepg== X-Gm-Message-State: AOAM532Tx/235NUXOYV8ozIlZbXfXvxLFQid9rJrVQxyc0DV/O5O9jMf Ui+p039XnD8V2wxoOX+PLhZI1UfvAlAZKA== X-Google-Smtp-Source: ABdhPJzIeQIJqFm2rmJ7Dg74vl0157FGfujTYWwdTBdPdIT0d23Q3PzZarZKxLnsqodsV9AUBvlQ7A== X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr29022598wru.117.1592205680600; Mon, 15 Jun 2020 00:21:20 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:20 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:47 +0200 Message-Id: <20200615072055.2083-8-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 07/14] package/systemd: fixup RPATH for more systemd host binaries X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" All systemd binaries depend on libsystemd-shared and need their RPATH fixed. Use a glob to catch them all Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2cc71ee667..2c7f35bf25 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -659,6 +659,8 @@ HOST_SYSTEMD_DEPENDENCIES = \ host-libcap \ host-gperf +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + # Fix RPATH After installation # * systemd provides a install_rpath instruction to meson because the binaries # need to link with libsystemd which is not in a standard path @@ -667,20 +669,11 @@ HOST_SYSTEMD_DEPENDENCIES = \ # * the original path had been tweaked by buildroot via LDFLAGS to add # $(HOST_DIR)/lib # * thus re-tweak rpath after the installation for all binaries that need it -HOST_SYSTEMD_HOST_TOOLS = \ - systemd-analyze \ - systemd-machine-id-setup \ - systemd-mount \ - systemd-nspawn \ - systemctl \ - udevadm - -HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) define HOST_SYSTEMD_FIX_RPATH - $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ - $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) - ) + cd $(HOST_DIR)/bin && for f in journalctl systemctl udevadm systemd-*; do \ + [ ! -x $$f ] || $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $$f; \ + done endef HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH From patchwork Mon Jun 15 07:20:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309262 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=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QPrxy0U3; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSK0M1Yz9sQx for ; Mon, 15 Jun 2020 17:21:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9307D86F9A; Mon, 15 Jun 2020 07:21:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EDKzhA8_-Hko; Mon, 15 Jun 2020 07:21:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1378186FD5; Mon, 15 Jun 2020 07:21:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EAD941BF4E7 for ; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D69CA88F13 for ; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PwhK+sAY9bTG for ; Mon, 15 Jun 2020 07:21:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1A4AE88213 for ; Mon, 15 Jun 2020 07:21:24 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id r7so15930766wro.1 for ; Mon, 15 Jun 2020 00:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/T9xZwvOPTg4hkaQoi0sw9j7xnTR8BrmzK7xjdZdJns=; b=QPrxy0U36iR8Cmh4HQUlFtpXwHxoP0mZP8z+ECxzETPVT2qi75sROk7XDE9qaPrexZ QbkinneIUM+ixbygHl5iF63M++5CyxlVAvmEwcwVN9uRZe5DseN2lWsyAXKVYN90LT2H /mmBwT4Tq0yDtwj7HB41z0lbh5YKBVcuigBnSj6RDVSYJabdKARCxUeHFIJJw23FRyX2 8V9kqZqvOugHctKxzN0zKLWtwL70Dp94Mb1TM+V8QguDLJyRT8JUfPuLIql9GQSgmnBo uYGBmdJt8SUYA00enxfWooT5Ca4pGhWVzQC2AypC6j/VN3wwvF1Fnj+UbJ7Z/3g9FWeq YcbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/T9xZwvOPTg4hkaQoi0sw9j7xnTR8BrmzK7xjdZdJns=; b=n5C0AFniEpQUfFWM6CnYgbS0fYizowhQRx4W+gHNfpFJEbFeE00Dt5wQB4Ymx/UFhF 3cY4hKSV4ziuAhQ8gZV6CtDJqQceF7tLsXLGCVFBToVAGQrhdDrOzgr9HUr6eI+srm76 Gz10+uphCL6riKS8EmQRCV6yA5Vv21m66yRKHDrsJXr+hgNtL+EiITNtASWQrx28/3Dd OuEq4nZwj8pK43ce3X+xU0q8e1BJ2UMdo8jHpze+oEGYqdJuLN7ho9XiY5SEQqM9UVOz ttfU8bXOPsId3nmEphxqNNfdp1yw4TwOg0OQozri8NQihDwCwIsETUf+FWAFixTBH3IT 0+TA== X-Gm-Message-State: AOAM5334bp3dBXJ9mEv4Nu6uUmdTb2c+6tzg6q5W+9w3PU9Jzw3jliW2 54Em5SEK9Qbge60n6gH+KloXOGM2wJyVaQ== X-Google-Smtp-Source: ABdhPJxyte869MCTK+AHel7uzKPi4jEpxsDZBccrxjEdH2Rd1wFA/RxSUZnmlv5qceSEb1B5tOmX/g== X-Received: by 2002:adf:8b55:: with SMTP id v21mr28474725wra.187.1592205682231; Mon, 15 Jun 2020 00:21:22 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:21 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:48 +0200 Message-Id: <20200615072055.2083-9-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 08/14] package/systemd: add hook to update journalctl catalogs X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" journald supports catalog files, or rather a binary database of those. This add a hook to create said database from the available catalog source files (which are not needed afterwards). One ugly workaround is or ensuring that PURGE_LOCALES is called before, we do this by adding this hook (will then run twice during the finalize target step). Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2c7f35bf25..d3be92b78c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -579,6 +579,16 @@ define SYSTEMD_PRESET_ALL endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL +define SYSTEMD_UPDATE_CATALOGS + $(HOST_DIR)/bin/journalctl --root=$(TARGET_DIR) --update-catalog +endef + +# SYSTEMD_UPDATE_CATALOGS needs to run after PURGE_LOCALES +ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) +SYSTEMD_TARGET_FINALIZE_HOOKS += PURGE_LOCALES +endif +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_UPDATE_CATALOGS + SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) From patchwork Mon Jun 15 07:20:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309259 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=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LTChAu2i; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSG2wPjz9sR4 for ; Mon, 15 Jun 2020 17:21:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 31C112001F; Mon, 15 Jun 2020 07:21:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R-U-v+AcS60f; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5B2D8203C2; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EA7B61BF4E7 for ; Mon, 15 Jun 2020 07:21:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E36A28705D for ; Mon, 15 Jun 2020 07:21:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NKNFbXgz-cvs for ; Mon, 15 Jun 2020 07:21:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 81D6286F9A for ; Mon, 15 Jun 2020 07:21:25 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id f185so13666201wmf.3 for ; Mon, 15 Jun 2020 00:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Esvtu9w/7S45pbDCeoFUqJryN/+af11fy+m8V4tBfMc=; b=LTChAu2irA+Rt0+T2v3GlbiVyIxDAhkyXuNRLHnoGS33Qr/Cz0mWnkfejLfY13TFCv R94wJQU2qzuYPsAfLBIPS35RwgSqNMcoWCv7RipxebUCxX8EhMlkwnA+hLGwjo2PVQ6X TKj2+89sVvbezqPXMnm9XkztR4GfO1Im0k7pSGXSIRhmLaTVFGYPJKhvY/Xs4MsgRlsS O5yrvCybroHNpwIY8b+Tofo0dqlGF7pYAJnsc6KbkdE5Zb/79Ax6lwJ3ItjscMzgDxlM wURnnRn8w3ZNzH8g/nyNqpUnnM46+hjtzoQqg8wNjrokjWvQymb8A9k201vI0aaTKVNq l+eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Esvtu9w/7S45pbDCeoFUqJryN/+af11fy+m8V4tBfMc=; b=XSpWdu2ubOoEh3bNPa6Tf4CLcAWm+s1utlbiYIpwOvvZem6/hnYdNy3UGma2an0GMF KNIIAsx2lULHji6bs5NyiVxRYQQT3t++BZtISB2oyLzxmtF3b5+XoqT1hDUIVihbDbKb QBZKv4ChFl1Xnng4MxAp8IfZQqN0xGfE3SYZf0qgNVl99bpNHItsRB6L6nMSqklSJ5lJ d1QoD6A/K1mkWyWQTXRmAkCgxBwtnb61tRg+ht7jVtLJz50g/4gnB2dh3NKoq3mMF7uh VHkf+w8D0l3w1kdWpPcWXvlYOZr4D/dQhzn96PtemLPFmmOsUXUzFTqD+2063RFYLRw9 TZRw== X-Gm-Message-State: AOAM532CD9iLDHIO5Q5fnFMZVqAOJG+z6+fvKu4tLSYIxq5y7pF3XZUh rODJ6R6nJnJmxthAfAcQ5RDZFk3Osrb8cw== X-Google-Smtp-Source: ABdhPJwUZyg7qiriDCEESmH0hht61jdSAoziTvNxUq+wHVp9iLUC866TVfKj0AC87Wfkr8GDBT+hCg== X-Received: by 2002:a05:600c:2294:: with SMTP id 20mr12083136wmf.51.1592205683758; Mon, 15 Jun 2020 00:21:23 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:23 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:49 +0200 Message-Id: <20200615072055.2083-10-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 09/14] package/systemd: option to delete all catalog files X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Unless you need to rebuild the database, there is no need for the (source) catalog files. This option removes the files, and the service in a ROOTFS_PRE_CMD_HOOK. Signed-off-by: Norbert Lange --- package/systemd/Config.in | 12 ++++++++++++ package/systemd/systemd.mk | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index dd3b8c534d..b09bd36ab6 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -251,6 +251,18 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands +config BR2_PACKAGE_SYSTEMD_RETAIN_CATALOGS + bool "retain source catalog files" + help + catalog files are used to provide extended and potentially localized + messages for the journal. + The files reside in /usr/lib/systemd/catalog, but arent used directly, + instead a binary database will be built using these files. + + Only if the database needs to be rebuilt later they need to be retained. + + https://www.freedesktop.org/wiki/Software/systemd/catalog/ + config BR2_PACKAGE_SYSTEMD_LOCALED bool "enable locale daemon" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d3be92b78c..e117e3a082 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -464,6 +464,16 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif +ifneq ($(BR2_PACKAGE_SYSTEMD_RETAIN_CATALOGS),y) +define SYSTEMD_RM_SOURCE_CATALOGS_HOOK + rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog + find $(TARGET_DIR)/usr/lib/systemd/system \ + -name systemd-journal-catalog-update.service -delete +endef + +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_SOURCE_CATALOGS_HOOK +endif + define SYSTEMD_INSTALL_INIT_HOOK ln -fs multi-user.target \ $(TARGET_DIR)/usr/lib/systemd/system/default.target From patchwork Mon Jun 15 07:20:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309261 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=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kinA7sT4; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSJ0bfMz9sRh for ; Mon, 15 Jun 2020 17:21:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 81DEB883AE; Mon, 15 Jun 2020 07:21:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16fSrL27yIwL; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A8B008820B; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D325B1BF4E7 for ; Mon, 15 Jun 2020 07:21:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CFB08882E3 for ; Mon, 15 Jun 2020 07:21:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qsGOLGoI2MLZ for ; Mon, 15 Jun 2020 07:21:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2F5188806D for ; Mon, 15 Jun 2020 07:21:27 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id h5so15935571wrc.7 for ; Mon, 15 Jun 2020 00:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iteqrBQiLucQszd2W7DGq0sewslB6sbGX9GbvF19ZSU=; b=kinA7sT4PETDU4h82UoJzLFxa7B+/SAhQBiW5GcbqRDxgd7SAYu86iitGtlDw8q7Mq deJgqf3wEsaBENsP8rRu996Zx7wb52f7ib4bKGrRaJOVfQcugR5neX2ITFs4eaOCy6Z+ ImOfIR6mLrAPSIsaw8lwmyel3TazeJjSGM6/HPzGDsMMgwd/+Mq2wJgvtOavg0nwanpL wiw1jiWZyVCjM9hPEs32h/RuCd2zgg+UyQLcrluHCmKvgnhYgN7Bxe1VuQTfsdYqFw/Z jxPy71fB9W78sUxT2BdeKN+q+k1kiCvIykMWd1175MN00r4o6w2/tvJv6//b0FA3xHL0 nlZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iteqrBQiLucQszd2W7DGq0sewslB6sbGX9GbvF19ZSU=; b=H9zjTAli0X4pmI79ygFRLtUQrL77cP2RfOMhYXFWehJA+zRQB4kBWoTdKHa4W3xiQN ub6UO5daD7OZaQMvrs/zwUSmUMECMH+/1uZBXj7FPan/SRizOJp+mx7OFa3PXQQS7yow qq06GcZa/Nm42xVjkiqr25kXDzV/SGw5Y1E9GTJH9tW+p+Lch2FoGBT8F3JH1II349Xt vWe0Nr/nnqnMpg1l4ICL9gu3s3Eq9Ktzef44V7gIDYEwqSPEgFs8LETSzZDEmH3no/Oh 4CTUC7HqLx9rDN8FiopgQ5CG1nqaJyrC/WXiIrFTG2vvvMhMHH+53LomkmWbWGTFa8eP +X5A== X-Gm-Message-State: AOAM532KYsthkFgQ/t6+bmdxvFpLyi456gH725DZjog6rz2XoIL8U3CK 6mq/Z3XD5MPJK5ikE6ML2rZvBJnNYlpufA== X-Google-Smtp-Source: ABdhPJz6PcIB5cAxy2f9YbYaZgvOJnffOfwrCgon2zqIhmf25D/C5GyMur+vvqG27TSpaRUbCFwF3w== X-Received: by 2002:adf:f6ce:: with SMTP id y14mr28360495wrp.90.1592205685287; Mon, 15 Jun 2020 00:21:25 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:24 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:50 +0200 Message-Id: <20200615072055.2083-11-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 10/14] package/systemd: invoke systemd-tmpfilesd on final image X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Especially for read-only filesystems it is helpfull to pre-create all folders for non-volatile paths. This needs to run under fakeroot to allow setting uids/gids/perms for the target fs. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e117e3a082..cb0278f3b7 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -599,6 +599,12 @@ SYSTEMD_TARGET_FINALIZE_HOOKS += PURGE_LOCALES endif SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_UPDATE_CATALOGS +define SYSTEMD_CREATE_TMPFILES_HOOK + $(HOST_DIR)/bin/systemd-tmpfiles --root=$(TARGET_DIR) --create --boot \ + $(addprefix --exclude-prefix=/,dev mnt proc run sys tmp) || : +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK + SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) @@ -652,7 +658,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ From patchwork Mon Jun 15 07:20:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309267 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=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=l4n1g4/5; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSc25L4z9sQx for ; Mon, 15 Jun 2020 17:21:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2BAD324763; Mon, 15 Jun 2020 07:21:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oULz62JYdUjN; Mon, 15 Jun 2020 07:21:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A4C91203C2; Mon, 15 Jun 2020 07:21:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 42F7D1BF4E7 for ; Mon, 15 Jun 2020 07:21:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3CEFB8800D for ; Mon, 15 Jun 2020 07:21:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2OYY-P5CLSSo for ; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id C165288EC9 for ; Mon, 15 Jun 2020 07:21:28 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id x14so15921639wrp.2 for ; Mon, 15 Jun 2020 00:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bMo5wvPDaonw8T0eAxij8QX9V2GzlTLDvqVREi6aUqU=; b=l4n1g4/5/s7DzLI5Hr9XlIqutpuNnrH0Dnu9QF1pIHXmFDtsa4PkD5S9B5cU+U6dxk gRFuq/DK4aEXOq0wUtUUQVEhpl45q2tiidNEVbP1i5IcvQiV1TP40ai227k4pn5h28jg WOga6osGiZkbNj92T5tgn2cqIhPoOOoU+dM7HXM0jVvsqLHxR3aOsGjeYZt0EMfqVK5z VMgpl7gfudutrw8gmob2J2xsVb4RYVuJXQjT15LAO0DRxFswMqk6gZkdXy/iYyb7j1O2 IQopst3jS3XXkVJmJmt99gM8g2KO7Dzvt600o1qnBbuyXrH4MxStFXof36SxX40GJlLy AEEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bMo5wvPDaonw8T0eAxij8QX9V2GzlTLDvqVREi6aUqU=; b=mqm6Fwzr2ddM0MXtMo5YQwMIg7IbPYA0rb9Ehto+Csq6jAPfiz4N6W4jdICDSi4Iv2 i7Cg7qeSw6dlTiYalT0FW4/4QQyRDFf1G0a4XTWuGYl+T/vzxZ0ezYI7Rqt4kzHOU4MG tKJ2JQeLmJxxIOJw8ftOe295W8feoijGtT4ySrmg83h6021opPmQkk2tF/4AgE6aQmFb HhGyEQwfqQ1LSylorMM4RoFE4AiV3O/VwRSNPd9RHCTDN67r1OMhaZHCUnKfoteNUzwr zrqndJ+uoEaB9VH53dAvDkarUCQn0hXcJyOYRQoIu+zJzgH3xPr8ZC4kuRCISatF8iSq 0XYw== X-Gm-Message-State: AOAM532VPTtR5x0W1awXs+xVyiwy05sI/L/1qdq9YjFD03WE5ZPqrrj6 FvrTxpOZ8X4Fyo/f0yjtDYfRWKqEp/qb3w== X-Google-Smtp-Source: ABdhPJwmP3J3jX+VLUnY3G1k1hFZMjVZS57Cgwe5xrMEX7ZdE7ECXI+ROYCHFWkGTyqkZweG0XU01g== X-Received: by 2002:a5d:4d92:: with SMTP id b18mr28768509wru.296.1592205686843; Mon, 15 Jun 2020 00:21:26 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:26 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:51 +0200 Message-Id: <20200615072055.2083-12-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 11/14] package/systemd: use an upstream patch for tmpfiles X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" running systemd-tmpfiles will currently use the hosts user/group uids, even when specifying --root=. The next systemd release v245 will include this change. Signed-off-by: Norbert Lange --- ...e-rootfs-database-for-tmpfiles.patch.patch | 300 ++++++++++++++++++ 1 file changed, 300 insertions(+) create mode 100644 package/systemd/0001-use-rootfs-database-for-tmpfiles.patch.patch diff --git a/package/systemd/0001-use-rootfs-database-for-tmpfiles.patch.patch b/package/systemd/0001-use-rootfs-database-for-tmpfiles.patch.patch new file mode 100644 index 0000000000..5847bbd673 --- /dev/null +++ b/package/systemd/0001-use-rootfs-database-for-tmpfiles.patch.patch @@ -0,0 +1,300 @@ +From ab5b7df682c9e779e859a9caf9c2012d3db92dc3 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 5 May 2020 22:45:54 +0200 +Subject: [PATCH 1/3] tmpfiles: optionally, read /etc/passwd + /etc/group + without NSS + +There are two libc APIs for accessing the user database: NSS/getpwuid(), +and fgetpwent(). if we run in --root= mode (i.e. "offline" mode), let's +use the latter. Otherwise the former. This means tmpfiles can use the +database included in the root environment for chowning, which is a lot +more appropriate. + +Fixes: #14806 +Signed-off-by: Norbert Lange + +--- + src/tmpfiles/tmpfiles.c | 145 +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 137 insertions(+), 8 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 7137e9fbd72..6ece1b5ed16 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -2487,7 +2487,139 @@ static int patch_var_run(const char *fname, unsigned line, char **path) { + return 0; + } + +-static int parse_line(const char *fname, unsigned line, const char *buffer, bool *invalid_config) { ++DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free); ++ ++static int find_uid(const char *user, uid_t *ret_uid, Hashmap **cache) { ++ void *found; ++ int r; ++ ++ assert(user); ++ assert(ret_uid); ++ assert(cache); ++ ++ /* First: parse as numeric UID string */ ++ r = parse_uid(user, ret_uid); ++ if (r >= 0) ++ return r; ++ ++ /* Second: pass to NSS if we are running "online" */ ++ if (!arg_root) ++ return get_user_creds(&user, ret_uid, NULL, NULL, NULL, 0); ++ ++ /* Third: use fgetpwent() to read /etc/passwd directly, if we are "offline" */ ++ if (!*cache) { ++ _cleanup_(hashmap_freep) Hashmap *uid_by_name = NULL; ++ _cleanup_fclose_ FILE *f = NULL; ++ struct passwd *pw; ++ const char *passwd_path; ++ ++ passwd_path = prefix_roota(arg_root, "/etc/passwd"); ++ f = fopen(passwd_path, "re"); ++ if (!f) ++ return errno == ENOENT ? -ESRCH : -errno; ++ ++ uid_by_name = hashmap_new(&uid_gid_hash_ops); ++ if (!uid_by_name) ++ return -ENOMEM; ++ ++ while ((r = fgetpwent_sane(f, &pw)) > 0) { ++ _cleanup_free_ char *n = NULL; ++ ++ n = strdup(pw->pw_name); ++ if (!n) ++ return -ENOMEM; ++ ++ r = hashmap_put(uid_by_name, n, UID_TO_PTR(pw->pw_uid)); ++ if (r == -EEXIST) { ++ log_warning_errno(r, "Duplicate entry in %s for %s: %m", passwd_path, pw->pw_name); ++ continue; ++ } ++ if (r < 0) ++ return r; ++ ++ TAKE_PTR(n); ++ } ++ ++ *cache = TAKE_PTR(uid_by_name); ++ } ++ ++ found = hashmap_get(*cache, user); ++ if (!found) ++ return -ESRCH; ++ ++ *ret_uid = PTR_TO_UID(found); ++ return 0; ++} ++ ++static int find_gid(const char *group, gid_t *ret_gid, Hashmap **cache) { ++ void *found; ++ int r; ++ ++ assert(group); ++ assert(ret_gid); ++ assert(cache); ++ ++ /* First: parse as numeric GID string */ ++ r = parse_gid(group, ret_gid); ++ if (r >= 0) ++ return r; ++ ++ /* Second: pass to NSS if we are running "online" */ ++ if (!arg_root) ++ return get_group_creds(&group, ret_gid, 0); ++ ++ /* Third: use fgetgrent() to read /etc/group directly, if we are "offline" */ ++ if (!*cache) { ++ _cleanup_(hashmap_freep) Hashmap *gid_by_name = NULL; ++ _cleanup_fclose_ FILE *f = NULL; ++ struct group *gr; ++ const char *group_path; ++ ++ group_path = prefix_roota(arg_root, "/etc/group"); ++ f = fopen(group_path, "re"); ++ if (!f) ++ return errno == ENOENT ? -ESRCH : -errno; ++ ++ gid_by_name = hashmap_new(&uid_gid_hash_ops); ++ if (!gid_by_name) ++ return -ENOMEM; ++ ++ while ((r = fgetgrent_sane(f, &gr)) > 0) { ++ _cleanup_free_ char *n = NULL; ++ ++ n = strdup(gr->gr_name); ++ if (!n) ++ return -ENOMEM; ++ ++ r = hashmap_put(gid_by_name, n, GID_TO_PTR(gr->gr_gid)); ++ if (r == -EEXIST) { ++ log_warning_errno(r, "Duplicate entry in %s for %s: %m", group_path, gr->gr_name); ++ continue; ++ } ++ if (r < 0) ++ return r; ++ ++ TAKE_PTR(n); ++ } ++ ++ *cache = TAKE_PTR(gid_by_name); ++ } ++ ++ found = hashmap_get(*cache, group); ++ if (!found) ++ return -ESRCH; ++ ++ *ret_gid = PTR_TO_GID(found); ++ return 0; ++} ++ ++static int parse_line( ++ const char *fname, ++ unsigned line, ++ const char *buffer, ++ bool *invalid_config, ++ Hashmap **uid_cache, ++ Hashmap **gid_cache) { + + _cleanup_free_ char *action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL; + _cleanup_(item_free_contents) Item i = {}; +@@ -2718,9 +2850,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool + } + + if (!empty_or_dash(user)) { +- const char *u = user; +- +- r = get_user_creds(&u, &i.uid, NULL, NULL, NULL, USER_CREDS_ALLOW_MISSING); ++ r = find_uid(user, &i.uid, uid_cache); + if (r < 0) { + *invalid_config = true; + return log_syntax(NULL, LOG_ERR, fname, line, r, "Failed to resolve user '%s': %m", user); +@@ -2730,9 +2860,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool + } + + if (!empty_or_dash(group)) { +- const char *g = group; +- +- r = get_group_creds(&g, &i.gid, USER_CREDS_ALLOW_MISSING); ++ r = find_gid(group, &i.gid, gid_cache); + if (r < 0) { + *invalid_config = true; + return log_syntax(NULL, LOG_ERR, fname, line, r, "Failed to resolve group '%s'.", group); +@@ -2981,6 +3109,7 @@ static int parse_argv(int argc, char *argv[]) { + } + + static int read_config_file(char **config_dirs, const char *fn, bool ignore_enoent, bool *invalid_config) { ++ _cleanup_(hashmap_freep) Hashmap *uid_cache = NULL, *gid_cache = NULL; + _cleanup_fclose_ FILE *_f = NULL; + Iterator iterator; + unsigned v = 0; +@@ -3026,7 +3155,7 @@ static int read_config_file(char **config_dirs, const char *fn, bool ignore_enoe + if (IN_SET(*l, 0, '#')) + continue; + +- k = parse_line(fn, v, l, &invalid_line); ++ k = parse_line(fn, v, l, &invalid_line, &uid_cache, &gid_cache); + if (k < 0) { + if (invalid_line) + /* Allow reporting with a special code if the caller requested this */ + +From cc0ff79bd0f94336fc53407da7a20ff3c779456f Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 5 May 2020 22:48:50 +0200 +Subject: [PATCH 2/3] sysusers/tmpfiles: use --root=/ as way to force offline + operation (i.e. without NSS) + +--- + src/sysusers/sysusers.c | 2 +- + src/tmpfiles/tmpfiles.c | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c +index a36cfb210f6..9b57f0f933a 100644 +--- a/src/sysusers/sysusers.c ++++ b/src/sysusers/sysusers.c +@@ -1813,7 +1813,7 @@ static int parse_argv(int argc, char *argv[]) { + break; + + case ARG_ROOT: +- r = parse_path_argument_and_warn(optarg, true, &arg_root); ++ r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_root); + if (r < 0) + return r; + break; +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 6ece1b5ed16..dc1dd89aecc 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -2741,7 +2741,7 @@ static int parse_line( + + case COPY_FILES: + if (!i.argument) { +- i.argument = path_join(arg_root, "/usr/share/factory", i.path); ++ i.argument = path_join("/usr/share/factory", i.path); + if (!i.argument) + return log_oom(); + +@@ -2749,7 +2749,9 @@ static int parse_line( + *invalid_config = true; + return log_syntax(NULL, LOG_ERR, fname, line, SYNTHETIC_ERRNO(EBADMSG), "Source path '%s' is not absolute.", i.argument); + +- } else if (arg_root) { ++ } ++ ++ if (!empty_or_root(arg_root)) { + char *p; + + p = path_join(arg_root, i.argument); +@@ -2840,7 +2842,7 @@ static int parse_line( + return log_syntax(NULL, LOG_ERR, fname, line, r, "Failed to substitute specifiers in argument: %m"); + } + +- if (arg_root) { ++ if (!empty_or_root(arg_root)) { + char *p; + + p = path_join(arg_root, i.path); +@@ -3068,7 +3070,7 @@ static int parse_argv(int argc, char *argv[]) { + break; + + case ARG_ROOT: +- r = parse_path_argument_and_warn(optarg, true, &arg_root); ++ r = parse_path_argument_and_warn(optarg, /* suppress_root= */ false, &arg_root); + if (r < 0) + return r; + break; + +From 4ae0e6b69fff5ed93ec2762bc40ea59f69c68a93 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 5 May 2020 23:23:00 +0200 +Subject: [PATCH 3/3] man: document the new tmpfiles --root= behaviour + regarding users + +--- + man/systemd-tmpfiles.xml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml +index 7720ef53fa1..998fd0911ba 100644 +--- a/man/systemd-tmpfiles.xml ++++ b/man/systemd-tmpfiles.xml +@@ -161,10 +161,10 @@ + Takes a directory path as an argument. All paths will be prefixed with the given alternate + root path, including config search paths. + +- Note that this option does not alter how the users and groups specified in the configuration files are +- resolved. With or without this option, users and groups are always resolved according to the host's user and +- group databases, any such databases stored under the specified root directories are not +- consulted. ++ When this option is used, the libc Name Service Switch (NSS) is bypassed for resolving users ++ and groups. Instead the files /etc/passwd and /etc/group ++ inside the alternate root are read directly. This means that users/groups not listed in these files ++ will not be resolved, i.e. LDAP NIS and other complex databases are not considered. + + + From patchwork Mon Jun 15 07:20:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309266 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RL4CkDK5; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSV5BJWz9sQx for ; Mon, 15 Jun 2020 17:21:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B2DD88E9C; Mon, 15 Jun 2020 07:21:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4eN+Pu3jEiH; Mon, 15 Jun 2020 07:21:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 857B988212; Mon, 15 Jun 2020 07:21:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BB7BE1BF4E7 for ; Mon, 15 Jun 2020 07:21:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B28AC88F82 for ; Mon, 15 Jun 2020 07:21:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id exVAbRRTu4zi for ; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0E8DA87F53 for ; Mon, 15 Jun 2020 07:21:30 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id q11so15928320wrp.3 for ; Mon, 15 Jun 2020 00:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KZ+k9tcV0MDVMx/NzpJVsvgGGWMqdoVfRUKOwAc2S04=; b=RL4CkDK5tGF7uBz8wF3NduPq/IsljUxKkvDsyE9diwY+N+ZDXf8ZvJYorphm2DyFuI 6tqYJSGl1I7Cl0hTz4fx6/3WB7LG68dES2xRfMJSb5pukubc8kXVQ4ZEedxg8YdFPV0F u3nIwDiwT3GGrFb1R0SFN0fwrlX63+uu03ym1wTeDaamDwe48WLIsWXB4SB3PBnuXCTG RkffDxCsUDUc+hhGbyjtWaAeQTMmhpS9vklot8plI80kSK+7z/of8WIINZHJD7E9beRY xI7f6vaPZQLjtyCJObmzcOQYrZt0bvY+kgHuZdpph83NE6curY/Nbdek42Kdua5PExS6 3HxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KZ+k9tcV0MDVMx/NzpJVsvgGGWMqdoVfRUKOwAc2S04=; b=rTocOUmjgwbSW2KuhbifdymUQ/VLuajdh5/vCGID5r4eCzXt5h6s3GZ993bkoif4vO Csyz+LgCU15305awpWNy8Mcyr7tpMqDQJuKochWrqVMLJVYB20Dz3G+mOT8Zx3nZNmqB acRM++fzQ+rNZyc7tLmC8WIVnjy77lB5ca8hcujxXTQsthJRcO5F/ExJOTKnW/tKHQzU sYqbrxRmqgQR0w6jffRpAwh8vVgEfMvSu/+lHzKkQEHIP3RhiNhQ76Y2pw9Fwf4E0mvx kLuVQb92iHyegmPID1MNcppHnuk1aB6RpiUBWFDe30DCXtP//d6Pjmoy0ykhWvgu/M1S H+lA== X-Gm-Message-State: AOAM532XRSFXnIB3R2MmUtEp+0N9jmyBinT5mYoOVoqJ6mYrPtKPQvw5 K0lDxNgsWY415+ped4N5dTdHXRNExCzpjg== X-Google-Smtp-Source: ABdhPJwtPVfWkVecOL329gsI0s8xc4u4QhexOtZ9S9lMNQCFTePGVT7Wnr8AqQyiZbhG9MZN2ar46A== X-Received: by 2002:adf:de91:: with SMTP id w17mr29458495wrl.249.1592205688378; Mon, 15 Jun 2020 00:21:28 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:27 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:52 +0200 Message-Id: <20200615072055.2083-13-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 12/14] package/systemd: pre-create directory for timesync user X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" On an read-only filesystem the timesync service will not start as the state directory cant be created. If the directory exists, then the service can start, obviously wont safe its state, but will otherwise work. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cb0278f3b7..a4f0f2ef33 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -475,6 +475,7 @@ SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_SOURCE_CATALOGS_HOOK endif define SYSTEMD_INSTALL_INIT_HOOK + $(if $(SYSTEMD_TIMESYNCD_USER),mkdir -p $(TARGET_DIR)/var/lib/systemd/timesync) ln -fs multi-user.target \ $(TARGET_DIR)/usr/lib/systemd/system/default.target endef @@ -522,6 +523,10 @@ define SYSTEMD_USERS $(SYSTEMD_TIMESYNCD_USER) endef +define SYSTEMD_PERMISSIONS + $(if $(SYSTEMD_TIMESYNCD_USER),/var/lib/systemd/timesync d 755 systemd-timesync systemd-timesync - - - - -) +endef + ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd provides multiple units to autospawn getty as neede # * getty@.service to start a getty on normal TTY From patchwork Mon Jun 15 07:20:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309265 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=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Y0EJD7pR; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSM2L83z9sRf for ; Mon, 15 Jun 2020 17:21:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CD2C68705D; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vc4-lKi5JFUA; Mon, 15 Jun 2020 07:21:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 22CCD87074; Mon, 15 Jun 2020 07:21:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 482C71BF4E7 for ; Mon, 15 Jun 2020 07:21:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 452C98705D for ; Mon, 15 Jun 2020 07:21:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YgbtQFMLIUaK for ; Mon, 15 Jun 2020 07:21:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A539786F9A for ; Mon, 15 Jun 2020 07:21:31 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id p5so15888711wrw.9 for ; Mon, 15 Jun 2020 00:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pr5nfaGQCasi4jZAffcOExxVBPnRCoGObBvCVSJBc3k=; b=Y0EJD7pRyu/ys+Gzj3ON1axuX4fjNpQ/+Nd3q3XxNi6zqq7gdhhC2buXAmruKvfpfR 3ATOK0/nHhX5YeecyybtkJiKaywMxUgsovA0aPgKgXEFU8T9LlPnkDckgG3IlNoDs9kF SQSafMC9ojSM8lEmKuL3FZVza4Kse9FHww6d1wWADf4BYWkbm8lWkT3TsjU1lRm6x7lx 5Mz7xFrwTJReAazNvHBbjLqhTfflBEartRN+WXkefd6OwEWAqXbAX/F4EERiCTbGjq/P lP1IOFkbMxy39TgbV7uc4uscYM41Iyi/HVq+A6CA1lg60yt1lSc3sPuu3R36Kg38c0zi ooTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pr5nfaGQCasi4jZAffcOExxVBPnRCoGObBvCVSJBc3k=; b=IFcy4t3dXoO4Shf5xe/3AW9L2K8zYvzuL/0fuYHqzbqIfnZHrKJkH+DfRRPqoqum1d NavKBpHaU7MwJgBjpIr3uJj609fbGRCX3amIkT25aU2ucrQYdSBG/BmPiNR5PK+YX0K7 8eBMiMN7oxoHjk7SNRZ/feoMY0hlhtWvy6njtRi2hFWJM1xYF0GV7FZGbS/yP+2fyIz0 JzV8CkcwGBmUHljR9yx1MtJAfnNL8YRhG43R8y2Y3TLHS+FLj0GHdjBLqk6UFT71Jb72 U7b6ZGeByKnn5tSBfwiB1Wc44TmFsfecYAwMxc/mumJgaZjByEXkvc8A3gn14Vip0jHZ bDiQ== X-Gm-Message-State: AOAM5308I+hnBxNSBWdfQIT9UzxvAueRfJ+5k6wF8fImd/mWT+lp2hA5 bVFDhjcy0FIZCImgs24FONtavEW12PObkQ== X-Google-Smtp-Source: ABdhPJxWdk5GI7rmRbUwO0Eog2F3O9uB12UkYdqpeq9JPLvpihvX/k2FFkewFXaKOuPzESX0QDGycQ== X-Received: by 2002:adf:e744:: with SMTP id c4mr29170317wrn.71.1592205689790; Mon, 15 Jun 2020 00:21:29 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:29 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:53 +0200 Message-Id: <20200615072055.2083-14-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 13/14] systemd: remove hard dependency on dbus X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" A substantial functionality of systemd does not depend on dbus anymore. It is certainly possible to used most of its core system managment functionality inclusive logging. In other words, most commands from systemctl and loginctl do work, aslong as used from root. These features will need dbus (incomplete list): - Access to systemd from non-root - Loginctl - Timedatectl Signed-off-by: Norbert Lange --- package/systemd/Config.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index b09bd36ab6..a7f41d2a38 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -25,7 +25,6 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID @@ -90,6 +89,10 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" +comment "systemd recommends enabling a dbus daemon" + depends on !BR2_PACKAGE_DBUS + depends on !BR2_PACKAGE_DBUS_BROKER + config BR2_PACKAGE_SYSTEMD_BOOT bool "systemd-boot" depends on BR2_i386 || BR2_x86_64 From patchwork Mon Jun 15 07:20:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309263 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=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KuFgbTy6; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ljSM2L46z9sQx for ; Mon, 15 Jun 2020 17:21:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CFB2C888DE; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AW-mXJTad5Bm; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 42D55888D2; Mon, 15 Jun 2020 07:21:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 943301BF4E7 for ; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 90F078820B for ; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HYl3cR22h5xK for ; Mon, 15 Jun 2020 07:21:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id E9DCC8806D for ; Mon, 15 Jun 2020 07:21:32 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id l10so15887837wrr.10 for ; Mon, 15 Jun 2020 00:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DJYnwVcuGGl6wUb7QUS3YnHyLeqqOzuTopQI6Hk/rn4=; b=KuFgbTy6T6fFDmA9dBKGXsABIfonFjrtUvMdcdl9CTkyTmDAECvxYbvM+VAOrULzY1 f4DalEM7bgmj/2g1bqx09nlQCqgbeqpF3TCKjo3/J9hnwXi20ZWvrkwn9rpfDUgX3pS8 l1A+p8VT78mvCPzBFrVgyfGpK8UrROFup2J8iS6wMo2CZDLVbmd+KR9x20c2Q0xveN7Z pnKgvE0R04sM50wvG0b+ZHXdn6Knkx2SZUd/Xa4mZ1KFgn8C0Zvfn6paOACL1txofM2s RCq1FWpTI2iQ2vy7vDL+CYNIOLffgyhJXkBo7u4xuetwloxkvhBvpynDlnJgvRbbxH4M m0JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DJYnwVcuGGl6wUb7QUS3YnHyLeqqOzuTopQI6Hk/rn4=; b=QJG83I9xAgOh1IDiNYz1LDBHTYNdAtL/895qpn2S51s/UMzDzMlTG+qjy3UnN1k/ME TrDYPgn9UASpUrLBdyqeSuOV9KWueqI8yFRFnjA1XiW2VCJKnb17dp+2NF5WiMZ6mW7J 4AwJq49TWjfOrJodhYs1wnCtWnkB7dSEL+WFNamftaaO3doXHum/Lxx7q7+/9fwy3Ki+ 0hPSdfKB1nxL80bfjsg+6mN0HSPuFMvTGnXtcRaH6ohrlZ3XvrrQPGmV0VFDT6wbzM2N z0LuUOCNJrY42HmqyL60j7uHhG53Ava8cX6nY6+k+8muDf/L0P2CQQaViqhucKQ12FH+ Qkzg== X-Gm-Message-State: AOAM530eEmdwyEXgwc1dJABvQgyp/KOKseSo+A1Skc9k9AoQ1gmCqTI1 CVAWJhqdNIMZh4DJcr67tmB4RWS0+uZ7ww== X-Google-Smtp-Source: ABdhPJymWXqHnzMBxla/keCU8U8B06v68MjlH3bp5tlw3ZqiyNli8QA2r1wWxCrPkowzZjH/k5Thiw== X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr29023440wru.117.1592205691223; Mon, 15 Jun 2020 00:21:31 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id q4sm5605291wmc.1.2020.06.15.00.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:21:30 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 09:20:54 +0200 Message-Id: <20200615072055.2083-15-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200615072055.2083-1-nolange79@gmail.com> References: <20200615072055.2083-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 14/14] systemd: remove util-linux dependencies X-BeenThere: buildroot@busybox.net 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 , jeremy.rosen@smile.fr, "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" systemd used only a small part of the util-linux binaries. definitely needed are mount and umount from coreutils, the rest of the tools could be provided by busybox aswell. Signed-off-by: Norbert Lange --- package/systemd/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index a7f41d2a38..0fbc1de432 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -29,10 +29,8 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools