From patchwork Thu Feb 6 09:36:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234179 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=IzgCVMP/; 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 48CtcQ0mhNz9sRs for ; Thu, 6 Feb 2020 20:36:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C3CFC859E3; Thu, 6 Feb 2020 09:36:51 +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 D6BF9oQkfcPr; Thu, 6 Feb 2020 09:36:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E69DF85551; Thu, 6 Feb 2020 09:36:50 +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 5DD721BF414 for ; Thu, 6 Feb 2020 09:36:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5AB6D84836 for ; Thu, 6 Feb 2020 09:36:48 +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 8RAJFNjW-hdG for ; Thu, 6 Feb 2020 09:36:47 +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 794BA84528 for ; Thu, 6 Feb 2020 09:36:47 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y11so6264455wrt.6 for ; Thu, 06 Feb 2020 01:36:47 -0800 (PST) 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=P9oogxYm+W/OIgo4lJw7X8ErLHI/p0h5sWAhChFfPNk=; b=IzgCVMP/oxF4FhyCEGMRquuy4sh//4UTqVgjrZ66aCn2lKcVHIlba6cUr+tO41yWxE 4PjUU/wZ+bxsCQj1T5jGAh/L9QgvtdKeN+RlJoX7gQOhQBKUCBz2b9i7qyf6rBwPqGv0 LRe3IDX6Z5u8WZc71rwr1uDgj3O+dvRwqET4yLZV5GUDWSRU8eLmtxnEGnV+0jzi8iCx qf0zpN4nRFZsGpvClDRXYmnN12taZXyv7dtY000ofrsRTnx+zcti6ltUYtUMtmnoYM6F B0+NTTSKCLrNo50BALq3ao2vsJg6N/oViqDYJpcTEOAoWkkVvDqPxjPTBjWeRRMBVDkC hItw== 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=P9oogxYm+W/OIgo4lJw7X8ErLHI/p0h5sWAhChFfPNk=; b=B5u38szGZhQROvSm1fNGNM15AN8+gi90cLL39k3bl95bOsUi14Vlsws8rRLUB+oVJp DEk8nQ5QmIeeo3M5nNW5TcUBkloLwCHFRYMvicKj1dOzKP0TVv3FbTj7PnOizOAfHO3U YhTD8xfDdsLSEILn0mRZh25MqOIfksRA1vg7xGNToeIwtFBSRvPMakJwdxBnBMdR2m87 3Gko+fIr3pEXs5Ogsqy7/mYw7Q6BL1ASeykrL/cX+oth0ltKW073WX6ePioqR7Ywc2lb n2MtgVkNe41tZACFFNFWvSResCkRJNL45sZukzIMXivm+odAkaNQTpWCCOB4jxuEDDxa tAXg== X-Gm-Message-State: APjAAAX3QXtpQa/mJEe8M9t9EaXDKNyVMM2tOyTi1mIHxDtoyc6BThjV geoDRTvVlZW9ZFpvLhetfvbXz3EWlsUFiQ== X-Google-Smtp-Source: APXvYqziJoesT7YNYtuVrr0zkoTFeOFZdB6RA2RIcB+m+/qNSaPHKPWKLxh7T7+hhpd3GvVV0yiGNw== X-Received: by 2002:a5d:678f:: with SMTP id v15mr2876445wru.27.1580981805570; Thu, 06 Feb 2020 01:36:45 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:45 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:24 +0100 Message-Id: <20200206093633.251413-2-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 01/10] package/systemd: move preset-all HOOK to fakeroot stage 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 , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" User can drop in more systemd units or presets in an rootfs overlay, which will be copied over *after* the TARGET_FINALIZE_HOOKS are run. Instead, run preset-all afterwards from ROOTFS_PRE_CMD_HOOKS Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6e31a14ac3..05b07cfd1b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -490,7 +490,7 @@ endef define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) From patchwork Thu Feb 6 09:36:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234180 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=SYxBFZPl; 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 48CtcT38Yhz9sRK for ; Thu, 6 Feb 2020 20:36:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5235584528; Thu, 6 Feb 2020 09:36:54 +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 ZNRMDaetahBk; Thu, 6 Feb 2020 09:36:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3DCA84836; Thu, 6 Feb 2020 09:36:53 +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 E9F461BF414 for ; Thu, 6 Feb 2020 09:36:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E167C203D8 for ; Thu, 6 Feb 2020 09:36:49 +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 qNpim8IbHfG5 for ; Thu, 6 Feb 2020 09:36:48 +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 995DC214D2 for ; Thu, 6 Feb 2020 09:36:48 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id p9so5509521wmc.2 for ; Thu, 06 Feb 2020 01:36:48 -0800 (PST) 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=nJNIRsYG8wYHj4qDUoFcFflD4+cLIY+JuO4LGYaaHlo=; b=SYxBFZPlDXleIuCsLgrL/k0kQWnvww6gsTl6GlmqmuqHcUya42WkJJv8iB3m2fjWSK uufuIcFr6yQDtqfJS7m42EZBaGDuxWRWTovVwk8yCP2wQ/KzQ24s0hlNc19AINkbDA9z DvgXNgZxRY1dphKViTMmaIyxEArjnAcUGONpD4bjrKuF+PWDoYZdx5R0Zt2IPFhkB520 C83Qiw6+KVgh1IuH7tioGJ5lxpZDhMNNN5naMEwqYxDVFxpiW14l/ou/eGhurz8DGCRK DtqllPldnY08rTsoVfocUKBZdo1UEOqzeTzQjai5HT0t9GUNQSWrlX3RmcA1F3kmjfEY z3eQ== 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=nJNIRsYG8wYHj4qDUoFcFflD4+cLIY+JuO4LGYaaHlo=; b=VQuC2yvPz1HLfqYWGeo69Gjauv4YBzfmo7KtNg7L59xjHodrbJaMuxWKxUuyTDagYZ OI6teqwzKAWzKMj/jsYtzOf8Z2w9w9VIVOi5JtlH6J7DB/19DZux87ifl0YE54sA5WvU 6cjUEMuk5frMb1AH0HfmzwDesYrzES1mndHC172AdsT2epOTuENtE1IKvi3HBaEojw2J ekLXEvglRP0ZYJOSl34qjz6jEuZYvstXbA1gifJeORSN4+sRT5ItnXpaS3DKKvadOrMg eJgZrrkjUZVlGsMFm4L4o03smEMwnFiRUro5Jq2xvNeQlmDzAtzQA5XL4NyLrmXmTuib FkiQ== X-Gm-Message-State: APjAAAWvZgmA38kuw0Q58BRHAe1wKwts+gS3WLh6UQBIfMKcYjcidq/1 RYi2Z2kRwZb7iKVbzkNy0CoM40KNn3UFSQ== X-Google-Smtp-Source: APXvYqy9t5OlWSBJqVxBdgkg6arONmwcsWuJ5kKRrhcZcRiOlYCZPtHU7BC+a3ZZY4HscKkPTTKzkQ== X-Received: by 2002:a1c:3b09:: with SMTP id i9mr3419728wma.31.1580981806962; Thu, 06 Feb 2020 01:36:46 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:46 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:25 +0100 Message-Id: <20200206093633.251413-3-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 02/10] package/systemd: add libnss-systemd to name resolution 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 , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The feature DynamicUser creates users/groups without touching the /etc/{passwd,group} files on disk. Adding the dynamic resolver to /etc/nsswitch.conf ensures the Names are resolved consistently. Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 05b07cfd1b..a390cdd1a9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -409,7 +409,15 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef +define SYSTEMD_ADD_NSSCONFIG_HOOK + grep >/dev/null '^passwd:.*systemd' $(TARGET_DIR)/etc/nsswitch.conf || \ + sed '/^passwd:/ s/$$/ systemd/' $(TARGET_DIR)/etc/nsswitch.conf + grep >/dev/null '^group:.*systemd' $(TARGET_DIR)/etc/nsswitch.conf || \ + sed '/^group:/ s/$$/ systemd/' $(TARGET_DIR)/etc/nsswitch.conf +endef + SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ + SYSTEMD_ADD_NSSCONFIG_HOOK \ SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK From patchwork Thu Feb 6 09:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234182 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=E80+Ik6z; 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 48Ctcb0pcPz9sRs for ; Thu, 6 Feb 2020 20:37:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 39CD0864FB; Thu, 6 Feb 2020 09:37:00 +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 Az8ewATaIi5y; Thu, 6 Feb 2020 09:36:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DC9C086378; Thu, 6 Feb 2020 09:36:56 +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 D3DC01BF414 for ; Thu, 6 Feb 2020 09:36:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D043A2045A for ; Thu, 6 Feb 2020 09:36: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 IEQqg32aH5vM for ; Thu, 6 Feb 2020 09:36:50 +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 0FFFD203D8 for ; Thu, 6 Feb 2020 09:36:50 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id k11so6240487wrd.9 for ; Thu, 06 Feb 2020 01:36:49 -0800 (PST) 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=IWIaV3rimqXsSW91wEWdTt+ZZsuuyv+Bgg/YgsI+GwQ=; b=E80+Ik6zc1aa5fjpS5f4jAROnf4xPJIa+u3fIfs0abp/o0Q9M2LAt+R6hpY8vrFi/s y7UM+IYLFljud1cGRa/Hs6pgEVpRnSkmk4xgknMUBBVaAvSaLTB5mCAP6iGdi0sIj0cJ yUu4DXXX+uaZUIDNeD2l0gMPn4Rr3Fr6UeLhMKgA4eMRvmgfBwvbyXKrZLBjrZqUYLy5 mTv+trwXoOkOiS/W/jgP4XzoFLQvKVY2/U31Cdgd6klJRVSgZuhv6013/nmxaLQppewF BdoSezNFFvZi7WBS8JpM8qlr1ntPyPFlM9Op3WNU0cB0naiRoOcXT4uiUDFzyeilHpvo sufA== 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=IWIaV3rimqXsSW91wEWdTt+ZZsuuyv+Bgg/YgsI+GwQ=; b=kJTJz2wTlWNDzUWH4Htao5PWokyQCz+5v+dbRmwD1AJV+TuNzMVjisf+5+OgJITwZs BYUiJlYKABjIneReAF6evZOBPufPExGplZxoMbFF5fdOCwb+qbhHWy6qdVjCJ8EXi6y8 vhLtW4DM6s93ktAcEs0htZcL35DpiuzXH8kQd6Imm0uWuCwl+dHuhB8G27FZcET5+zxm 8OllM4aGjvoJhn4SZ0xE2/M7M8UOJtS4492Agf4D8AilWJSoPjt0fIhwb+bBWV7wMfZz v3OTtq1DjwCASVpMHUKo8bb6rESqFtQXidskA2xKRU4hSh8xSHOlCUDNdelGcyctKcEj Gqcw== X-Gm-Message-State: APjAAAVQjm6WBWwzHlKpONTr+tiPnbEblgkirTsKOevCCEdvTHyWGX5j +WiV7YxrT5G5gGDDLlsP+/MM3LXcjrinzg== X-Google-Smtp-Source: APXvYqxY0SCTaWaKrTSeHHmKpogMWdmHf60l9Fuu91LoJKcaxZ3FXvGdxD4rmfqGOUV44RFMDPChow== X-Received: by 2002:adf:e781:: with SMTP id n1mr3070985wrm.56.1580981808371; Thu, 06 Feb 2020 01:36:48 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:47 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:26 +0100 Message-Id: <20200206093633.251413-4-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 03/10] 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 , "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 option 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 a390cdd1a9..b46c4fd540 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -431,10 +431,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 Thu Feb 6 09:36:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234181 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=j/uEm5QO; 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 48CtcZ5sksz9sRp for ; Thu, 6 Feb 2020 20:37:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 855C421539; Thu, 6 Feb 2020 09:36:59 +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 EYFSjisZ3S4C; Thu, 6 Feb 2020 09:36:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C991A2045A; Thu, 6 Feb 2020 09:36:57 +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 C769B1BF414 for ; Thu, 6 Feb 2020 09:36:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C2E432045A for ; Thu, 6 Feb 2020 09:36:52 +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 Q9iFfJdH76bv for ; Thu, 6 Feb 2020 09:36:51 +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 silver.osuosl.org (Postfix) with ESMTPS id 76493203D8 for ; Thu, 6 Feb 2020 09:36:51 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id a9so6124985wmj.3 for ; Thu, 06 Feb 2020 01:36:51 -0800 (PST) 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=G5dbcpsTPsEbBohUUwwJiOdWYF2Dqa6JZkqxNpubM6c=; b=j/uEm5QOSyuTkE13flS6XJQPGeDfjFo1O3H2Tc8lYAtI+lXYqwZ+eLvfH67gfSBLDO hE1S9AEnFPmfhQuInLuRN9O3lKQZeNFHKz/Zve4J3OPP2FiPai3EYrEJpLfcP+5/Ktub aQiAiiLYIHKIgmdpZ+OSU8PsP90bPGhFcbN8WKBVzwe8M5eb0YoaOqWRbmuNlLXxt68d 7ChdEua/u0+VPSkfxNWVhDAqP9S9aUkBslUW1jK5oWSHpbsuHJXpz5Ho1CmtU2WblTgM wCNrj7X0xwLBcvAKCxt/PKMdICqDa/Cqq8PPKWhhyGU8wPQ4NPrNsVuj20M8/xXTEqcL 899A== 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=G5dbcpsTPsEbBohUUwwJiOdWYF2Dqa6JZkqxNpubM6c=; b=d719GlOXJtL2h/P23+aX1hF2xk8JsobvviqDtWuUtc8bnVW8VPDX2rqNPydtGgB5nZ agiiGyIYkp1gJe8M8cTAGkL3BpKiYEuCiD16eJdAv8WJ/0umIoTnaAhFHm8u1f3R2m7Q a6zSy811WUAGF2il+qY5UjN6C6lNWdcc86fvByMuwLjvms+IxGAb+XTRQqM70DGSXWbt bYEWgWPS+gZltfp4NpBnKbGf9i9lZXVxBWfX4HppDWj7MFDlTk4gc3JInpaO3Rm20eRX +gvZ4wBB4/eiNbnE/PS6HGbBJlvodTvlsFQrv/teoSsUakOP/zA8kZhxaCUXspI1Wxwv jbKQ== X-Gm-Message-State: APjAAAUs8k2aaK4nCR97u7ezug+mcdewWAZ1h69f/rUneqNdqx+ovNIo XVrnBc1Vsr5/TRYv8Z5wUgT6Dwos5VNzrQ== X-Google-Smtp-Source: APXvYqx/soUzOdBtBnDK1dJvFypLT6eD21gAlpkS+5Rr4XejN3/oOiBdfo9dN17Z+KZc25W+H/ENFg== X-Received: by 2002:a7b:c084:: with SMTP id r4mr3287168wmh.99.1580981809699; Thu, 06 Feb 2020 01:36:49 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:49 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:27 +0100 Message-Id: <20200206093633.251413-5-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 04/10] 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 , "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 b46c4fd540..b3e83b5d3b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -181,6 +181,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 @@ -431,7 +432,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 Thu Feb 6 09:36:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234184 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=PfxGe8EQ; 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 48Ctcj59Z4z9sRs for ; Thu, 6 Feb 2020 20:37:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 103FE2155F; Thu, 6 Feb 2020 09:37:06 +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 Q+lSkAB4UJZO; Thu, 6 Feb 2020 09:36:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D0C9B21517; Thu, 6 Feb 2020 09:36:58 +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 3CC461BF414 for ; Thu, 6 Feb 2020 09:36:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3918E2045A for ; Thu, 6 Feb 2020 09:36:54 +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 JGi6uHnUbtIM for ; Thu, 6 Feb 2020 09:36:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by silver.osuosl.org (Postfix) with ESMTPS id E4425203D8 for ; Thu, 6 Feb 2020 09:36:52 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id f129so6123680wmf.2 for ; Thu, 06 Feb 2020 01:36:52 -0800 (PST) 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=lZ+x0haFJm5jPZBRP2LAgbQpC81jwqwXC2L+A3LMpH4=; b=PfxGe8EQwFUlKLvsrwG/cbTWPPczd6QPRX/649qpW4Lhe985Fao9scIuYViph02KR9 X3GhAiNxXKsDQ/aELcREvHd1fI9W8sTmdjGfUIAve2//MylxeiJ1iXi/XfxUqMDkiub0 FV0SWEC2TiIdVUBkrS8MLWu8Ka/85ic0WZ1rtTma49ek2BZo3FwFDZsYUB7KTanM3KRK k2JNY/nOES7AaOu3/kX3dM8/EEVXWuC1piUzeWxtrAcen7PNrZtTmuWrHwuv/VpTWxvi LfzWoR61nViM7mYZ91D7YVMRGqm9ldoUOfDeFYm6A+H7xXAFo2eTHFkNX8DlxmIEjhUb 05LA== 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=lZ+x0haFJm5jPZBRP2LAgbQpC81jwqwXC2L+A3LMpH4=; b=aQFEfNysGns9MoWUuZ1jNWuqUR7gYOORSqLl+/+e8pGy8x6tyJs22i0L6O4KhK9kyq 7kQf25+b8vCXqLQJuzhpSXTwrjYrJrFFwZzu0q6rmw2UXZMovwJRUhx6NYw6Rh1inRH7 B3BvxnWyizHLOHRgn8W6A+HK4/8+qHpXS8F3kD1628pnKofMB4h3pJiC8wZxaGe2M54q H9pZgJS9ivKO1zPmi7xzRosaU/jbXSLjEKwBi6CP4GuOZj6LDgB1khervLjZyD6/n7yB 7PKvHy2rh5kdCVonAxP6JnboS5xZhSdGHE1OdrM+6JZaz9N30TyaWiPTrFBQKk0iz/0d Qa1w== X-Gm-Message-State: APjAAAVHpOZPWlLwp+PAl/ttAVjmsAJcskHTX40gmjKQA42xYbX98HHG wCXCegfMSoXwAoy8R6gMiqKIic91mHYe/Q== X-Google-Smtp-Source: APXvYqzRyK8VkleUhu7R8VkU7/gSkaJwIVuSUstkKlTyKyFHpeTthrqPC86km+lDMjtG4PVUAPGV5Q== X-Received: by 2002:a7b:ca49:: with SMTP id m9mr3625465wml.50.1580981811154; Thu, 06 Feb 2020 01:36:51 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:50 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:28 +0100 Message-Id: <20200206093633.251413-6-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 05/10] 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 , "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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b3e83b5d3b..b6bd85f130 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,10 +428,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 Thu Feb 6 09:36:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234185 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=tJoHNTHs; 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 48Ctck2y3gz9sRK for ; Thu, 6 Feb 2020 20:37:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 52F5A21561; Thu, 6 Feb 2020 09:37:06 +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 u0mSyRGWzcl3; Thu, 6 Feb 2020 09:37:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 449BC2153D; Thu, 6 Feb 2020 09:37:00 +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 B67F21BF414 for ; Thu, 6 Feb 2020 09:36:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B39F986378 for ; Thu, 6 Feb 2020 09:36:55 +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 6hcS5iQ1WiZE for ; Thu, 6 Feb 2020 09:36:54 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 4D9D783775 for ; Thu, 6 Feb 2020 09:36:54 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id f129so6123764wmf.2 for ; Thu, 06 Feb 2020 01:36:54 -0800 (PST) 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=wpVi+SeHLduZWXlesrSlJ3+X94TUqFg7rhAoeiRc9Zg=; b=tJoHNTHs6h7zrQRgMPgZIcCRunxuEPLK6sdXv5Ecjo042S7LYzpaGnFPHJl6r8/xtu WnHLE/8PW2yluVeJIrCby3cC7uXsKn9N8l1URdLmvqHET7kNw24QnXNm+UtjYWIRDZE0 vHZVYIOEzC+e+8SFHeAw5AlSCoM+NiwEI5jvujiz5WFlY5Wm2UgY6p5/Gh+/hhSMNsFa 2BgUZ1MMG/MWhQVTmKh8HnKSTlGzPkonY9e6dZlNHZN4d/48byt28AU4QV6mWg1zxb+A qX9l0a1967kznSJc0bNuCTHM6he40bOhv0rrEy5j6c2M7OE10Osvli30bY07wy5EFx1r Z+yw== 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=wpVi+SeHLduZWXlesrSlJ3+X94TUqFg7rhAoeiRc9Zg=; b=D69J04+u4luxpEd0ja71yrx6jJGM44/a4nCekXuJrYhm9cgQ6zgdJRFIN8jS6DSMgY 8hUuuAyBJjEe8pYS7P68KnTto4xLtJsAxxLm0D6nUpzZmTF3W7TkTRIBz+wsdnUwgc8z mKMH//nfiqc6UhGbDuoFu89UGozLemqOtRLLbYMo8aPID+EPbC4JaGXmOQYvyo54yDVc 7deNz3ttLAPOvoYofRVJfut2SdLWlzhcQSgbvCwECWJIOqARyTX/Mq5ScCEvp63+U52Y oMwhvNkftV1WIDXXTabxaZAXJ5s11rP/upjYIpA50MSnP6yNDTqmllFMkUo+4CpKf+qb 05Cw== X-Gm-Message-State: APjAAAWJVm/uGkZ4PYLlraatv/NAWwIYtHV49oXfma3dVD9wUfnw741G auXOzX0l+T5cNIs2gw1RYL+CneuH5MM= X-Google-Smtp-Source: APXvYqzcxeiu2o4VyAHX/M1iyiwI5RwiSPfowkiG2bOKJ/iYm7fFz1afqVlmOgtVWiwEZzA3cHPAyg== X-Received: by 2002:a1c:41c4:: with SMTP id o187mr3444315wma.24.1580981812542; Thu, 06 Feb 2020 01:36:52 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:52 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:29 +0100 Message-Id: <20200206093633.251413-7-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 06/10] 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 , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 b6bd85f130..6ea25e3363 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -181,7 +181,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 @@ -305,7 +305,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 @@ -325,7 +325,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 @@ -344,14 +344,14 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK $(TARGET_DIR)/etc/resolv.conf endef SYSTEMD_CONF_OPTS += -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 += -Dresolve=false 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 Thu Feb 6 09:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234187 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=upEQEhsS; 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 48Ctcn30k8z9sRK for ; Thu, 6 Feb 2020 20:37:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C71D214D2; Thu, 6 Feb 2020 09:37:09 +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 C3xOVsRJlH4f; Thu, 6 Feb 2020 09:37:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A57C721546; Thu, 6 Feb 2020 09:37:02 +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 39CE11BF9B5 for ; Thu, 6 Feb 2020 09:36:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 34C0184836 for ; Thu, 6 Feb 2020 09:36:56 +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 pdXs7uCKQ5EU for ; Thu, 6 Feb 2020 09:36:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9C0FD85EC4 for ; Thu, 6 Feb 2020 09:36:55 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id s10so5499629wmh.3 for ; Thu, 06 Feb 2020 01:36:55 -0800 (PST) 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=DVJ6uzFuwK3P1gk23i9rGJKK2ym+q/1HemkREy4bLnE=; b=upEQEhsSMyM4mZ0rSd63dq19DCUkUPdlyk04ETHaKfPim94h3JXogYWzEOPy0xiSlv 0uvZW+PLuG7wTpMKDgDRKdH8w4F3evWOFb1ujxvrenIYOLkzM1erxX46bZN+ctffCTW7 DEtbguIz80Zqc13ofytbLgx1/E7zJwDqf5jap+AaP+nVKWn2OEdZl6ctBc+poKWVhLx6 UGc7gEHBBgmHkpDZQiKVw/Uvt68ru0CcgQ8dHsBev1YUs+1L3k4OlWyltFS2+sd/59j+ VC3dxnPD8/EhimfBDFCIEtHdAY3AfP+uFiqyCeieNqWt8mTbu2NLhB5vNT23iBG3g7Dd hZuw== 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=DVJ6uzFuwK3P1gk23i9rGJKK2ym+q/1HemkREy4bLnE=; b=V8sRero2E8uUQvjcjIX0aLAkW4KOCpzNLaJir1G8Es6bSxCL8fQYYUU6Sl0nTgeilu 89VJ5iRXuLx35LmqyZvDDGuOSXBRAhy1Mx6eT4/Yn3n2Zv9l/eq+uwh4N81EB8eQU/Jo QDzwWFcm9XTKypcF/dUSxY9Q7wq9KQRwZ2ldrDRvqTVbYXeqaw0bt74Inj9/BvhYfEE4 ADSWRE/bVGwguZBj9IrfQo25D/4p6UdbE4HeSeRwWCsevuJYVZTh8sIMS5r+8cG8lmXN pDF1L3qJC7y28pTcAtgZxC70GVm9PMtkpoZ5K15lCaVnwJ7cz/xmOwtiQtvU2RZYtldb klYg== X-Gm-Message-State: APjAAAUVasBl6OfM7K53WX88vlLdbB9yS3R5NWpFK/5VRn176qQ8w7+i kkz6rAbYP8xp/fKCYXFNPQzkTQjmTUg= X-Google-Smtp-Source: APXvYqzIl90Uw/+pcXNnj1RLLs0s1aKSlrKTL1hTzLMtaGnEytvlLT2/X/eu15O0tAnyiatbC/y+lg== X-Received: by 2002:a1c:4c5:: with SMTP id 188mr3464957wme.82.1580981813880; Thu, 06 Feb 2020 01:36:53 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:53 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:30 +0100 Message-Id: <20200206093633.251413-8-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 07/10] 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 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 a52f1c75fd..e6890e13c4 100644 --- a/Makefile +++ b/Makefile @@ -701,6 +701,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 Thu Feb 6 09:36:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234183 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=qw83tPw4; 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 48Ctcf3S8Zz9sRs for ; Thu, 6 Feb 2020 20:37:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E8456861E6; Thu, 6 Feb 2020 09:37:04 +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 Ze5U3akzdBQZ; Thu, 6 Feb 2020 09:37:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A04785A2E; Thu, 6 Feb 2020 09:37:04 +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 96AC21BF414 for ; Thu, 6 Feb 2020 09:36:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 90A2085E60 for ; Thu, 6 Feb 2020 09:36:57 +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 dj3ljkGsrMxj for ; Thu, 6 Feb 2020 09:36:57 +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 E24B484836 for ; Thu, 6 Feb 2020 09:36:56 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a9so6125375wmj.3 for ; Thu, 06 Feb 2020 01:36:56 -0800 (PST) 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=StMG/uLLaXDs/Uej5BGfw06OwfYnaZAkucSROToFXos=; b=qw83tPw4OkCL2tvxkB5iWBnomHctUwk1Zyj/IR+0sJJXdsyijYn4FueslVDVhzidz7 jRz5XPDaSiZPBG2BiT9Vli8Zwk0ofP430FxZ1QZIKvGsHjtRyHF6bkey7ED8piFWRrdC kUS94x1w57uPj5Cn/ZUT1lyNKXx4oLnSxZi1A/qXP5YEM3N34Fyn9QHAyFQSQsyShkSf J4a9lwS1rdipZsM/a13x7l/MjrECLoYoRTPBwjhOr2YOPlXy6T1qwrjkKM9OT9KvM5k8 IPXRhsDIiv+93O7eYPVWlKcLOBi1Pg/TGcf8CZzOERsZQfA5vl8YOWlx6UPmRA2P5CXx r/uA== 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=StMG/uLLaXDs/Uej5BGfw06OwfYnaZAkucSROToFXos=; b=K13TdI+RRVSa/Yfb3YkOox043TCjyOVa0/EnSQ/3YWfLdNbr/BL4mfO69r1v5P/Rqs dhJ5T6sTGPdVdj24maNIklsNYsyqaOXgsaEAz7obtAy09brP4nk0F8KE+SPS6N3DPPBn 2vc7OWV1q/dsLmPcIP9QT3KM+cwQTit9mASHy/8yieSOmIrfSJafWWYUe2tJRNWEOvLy ZqVTUYqMxCstq1z+ygwWoWEd5NRjrZ9Hui0otRntL7mR84qZXEk+fMj5DUvfT4XmiEJg fR+uNcuJdpv2OSXSHCC9NgNIGexB+fyqlgwniPwBNfOap2O5tZawuWaPjvdhK3p06APc OohA== X-Gm-Message-State: APjAAAVT9Nn3abR+jZW/WNixY6V9AnsJnNEC7S0HvBhN3DQg/tGuYMC2 acC8FTdfpT7FxS76gkL9R9f6AbeYQho= X-Google-Smtp-Source: APXvYqznvnPHxFIlCw9a8CSvwcBbO80Pj2ICXuQaHjR+LChdpbtHa3+RL8X5qPicfkQybr3HsNdFJg== X-Received: by 2002:a7b:ce94:: with SMTP id q20mr3576267wmj.4.1580981815244; Thu, 06 Feb 2020 01:36:55 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:54 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:31 +0100 Message-Id: <20200206093633.251413-9-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 08/10] 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 , "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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6ea25e3363..8db3a1b117 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -500,6 +500,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) @@ -577,6 +587,7 @@ HOST_SYSTEMD_DEPENDENCIES = \ # $(HOST_DIR)/lib # * thus re-tweak rpath after the installation for all binaries that need it HOST_SYSTEMD_HOST_TOOLS = \ + journalctl \ systemd-analyze \ systemd-mount \ systemctl \ From patchwork Thu Feb 6 09:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234188 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=IldQOJd0; 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 48Ctcw1BPLz9sRK for ; Thu, 6 Feb 2020 20:37:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B153121F6F; Thu, 6 Feb 2020 09:37:13 +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 kF8-N50xF5QD; Thu, 6 Feb 2020 09:37:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B797321538; Thu, 6 Feb 2020 09:37:05 +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 1E74C1BF414 for ; Thu, 6 Feb 2020 09:36:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1965E85E60 for ; Thu, 6 Feb 2020 09:36:59 +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 IUpFKzeH2YQx for ; Thu, 6 Feb 2020 09:36:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6EFC884836 for ; Thu, 6 Feb 2020 09:36:58 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id t2so6287649wrr.1 for ; Thu, 06 Feb 2020 01:36:58 -0800 (PST) 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=INL3u/Or4iF3XOx/uFP4cudH/zthPiU/BGTFv5//Jn0=; b=IldQOJd0P87kswAecVTVWbGWcXpdtA0nuJ++i6DVimfPIQJEQ0DGv7F83FmNN4xOQ8 O2VTeNacE7JaR+d7engNl5jzUX+d0g96gYyv69rYGmW+YrIY5EtnUpl+pFgfdGKRzU+D ZT2MxO28Jg5IQ6Y1mV9QbCCSwUzBK7LPSoJhXbiM+tHTnT4HfMavhM53okdd2uMrKgZd DlQtKZhZNFcz6clpr1K6GkYyBwLHDT9vU6epz5p8QnUL+4sUPqb+cnte9pdugZgXdXAu BlOIA7Aeyaf1ed+4Q82nCoWnuvCWL+CcDUzm5D3VaBbOxLRGl5milJJ3CwL+pbo+BQVx jfOw== 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=INL3u/Or4iF3XOx/uFP4cudH/zthPiU/BGTFv5//Jn0=; b=jiPhnqgKgHoLZ1fBJNXDghqps7OGziEyUTEWayZO3d/oQlhuNhPDLWkJLCwk9jx4k9 4holHg6tVgxggdZbMK/clQRpTkL/DBn2yEJbFH72yyhZHs5CQW/AGhFzaNEpi15NXtbR RumL7+/mLVpuIVYoNDBaUpxsw+eMYE+8ar7uHTG7EnQU1QwKMPQ7O4Bws2HfBz1QbXyB PuBYBVdbzKR6KJyzuibg9gpvbwCQeY9Q4zj+nArZr/Mhwe71R3h55rS9OPhDY+KZDP/k CDHzmPMTi+KZd+PvJB9tWw3laxlTYprDh0Zoo+4baJDJTtSXkD1/gQClzqnavPQIOmKi vkFA== X-Gm-Message-State: APjAAAVLfoub8MWIQzqB7wibMZBDrvBlRSBXhh1k4IzODMD8XceQjjdX a5elN0dIwRL3lyQ/CeZSpzEQdTwBZlA= X-Google-Smtp-Source: APXvYqzmQt18p3yCFE20tzE4bx9Jo5bpfKOC0SHGsZm6hKSU/xDEWupLhDjAC9KZLfGww1sprCeBCA== X-Received: by 2002:adf:ef07:: with SMTP id e7mr2923383wro.104.1580981816744; Thu, 06 Feb 2020 01:36:56 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:56 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:32 +0100 Message-Id: <20200206093633.251413-10-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 09/10] 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 , "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 in a ROOTFS_PRE_CMD_HOOK Signed-off-by: Norbert Lange --- package/systemd/Config.in | 12 ++++++++++++ package/systemd/systemd.mk | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index c727082a1a..c0727db94a 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -224,6 +224,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 8db3a1b117..4d6ff0be45 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -401,6 +401,14 @@ 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 +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 Thu Feb 6 09:36:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1234186 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=lr0UBYkk; 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 48Ctck3Zrwz9sRt for ; Thu, 6 Feb 2020 20:37:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 02D6B867FF; Thu, 6 Feb 2020 09:37:09 +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 1CJhDgfNR-qh; Thu, 6 Feb 2020 09:37:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3740E8620F; Thu, 6 Feb 2020 09:37:07 +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 52E871BF9B5 for ; Thu, 6 Feb 2020 09:37:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5008D85A2E for ; Thu, 6 Feb 2020 09:37:02 +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 xd3cW13nLnY0 for ; Thu, 6 Feb 2020 09:37:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0E763859AE for ; Thu, 6 Feb 2020 09:37:00 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id a5so5511852wmb.0 for ; Thu, 06 Feb 2020 01:36:59 -0800 (PST) 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=yCObtFIXS75qibGO0XtUsvTOTP2OKffd1aQI8kU+y2M=; b=lr0UBYkkSmyTQYhMZlgmVUfueYB/AKqVzUXsRQfFqr7WkFEwYzoHb5Cguw/HSXQmQH RyHE0lxaJdxV4s76ujBY3YkHy2tOBLWO3EKCUsCWaaxgGJ2EYTAIiGqvnqWocyQYj0BG ueyxv3olZPy8J21r0Mddrw61xPGUn5ZWXw4YVXIW2r/Nr67U8jX9Zxu4OyNoqsjbAxZ6 qp1yDXpGTVLAiN/aueYaElNLD8FJs5T5S2d9pOrMGEyYt9b+kvZGip2sIEKHR8eZuMI9 cwRIKsjBdF/GAW04kOwW6xJzPbD+/Zj4ktWpyV5cSp6sR0+j1T06Q3UHZFg0yEsCF1PO iRhg== 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=yCObtFIXS75qibGO0XtUsvTOTP2OKffd1aQI8kU+y2M=; b=tWhcx/B/BzhLxO3I7lA0Bt3oxq+5RCIh7HbBERCGNBIP8Zjj4v8p6v62yiZG3sGNfN +GRX3xK4+IG9vZZF2vo66EepScJxNoqNjEEFrSHvmJHRkPWVJ5pwn7NUODxdZRVQwYKo +Ti5kNuwAJe/+xxkVyX1i6Qn2b0sCZpTWdFGsPnhzepLzurwcUIOVhWW3W9IuDHK+4En UPDsr8cTRtWsDXXOZIkeXT5kEJc0HgGlom6srIEfY+CtauU3DyxFYgdSJ70ijaCS7+eE kYfbNKo43k4ViKYj74+trT2U02weLAfA830WpQ6p4wGzM9gRQZ3QGqCkqy2hTXL/6D+V khHA== X-Gm-Message-State: APjAAAUnpmNAuIWDaka6w/nff0Rsbv9gjQWs9yQrihx05Pu61Ke0O4br HCbApuZi1OnvBMKY9g2PUdyhTAKqgko= X-Google-Smtp-Source: APXvYqxqDe2+UnFC1nwcWsFAJFaY3ssumI5GyBWE9uvNoSjzIyYKQc2pkCatiSFuKhf3pCrCrvoi/A== X-Received: by 2002:a7b:c147:: with SMTP id z7mr3473242wmi.168.1580981818089; Thu, 06 Feb 2020 01:36:58 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id a9sm2873596wmm.15.2020.02.06.01.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 01:36:57 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 6 Feb 2020 10:36:33 +0100 Message-Id: <20200206093633.251413-11-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206093633.251413-1-nolange79@gmail.com> References: <20200206093633.251413-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 10/10] 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 , "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 Signed-off-by: Norbert Lange --- package/systemd/systemd.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 4d6ff0be45..69e2e1bf41 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -518,6 +518,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) @@ -559,7 +565,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \ @@ -598,6 +604,7 @@ HOST_SYSTEMD_HOST_TOOLS = \ journalctl \ systemd-analyze \ systemd-mount \ + systemd-tmpfiles \ systemctl \ udevadm