From patchwork Sun Jun 21 07:59:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1313847 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=posxTr7p; 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 49qQ4L4M7Nz9sTP for ; Sun, 21 Jun 2020 18:02:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0218F2CD0B; Sun, 21 Jun 2020 08:02: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 21sIfAnV6nEo; Sun, 21 Jun 2020 08:02:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 86F242CE4A; Sun, 21 Jun 2020 08:00:53 +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 336651BF847 for ; Sun, 21 Jun 2020 08:00:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 29CFE8814E for ; Sun, 21 Jun 2020 08:00:51 +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 kRcJs3xcWYQX for ; Sun, 21 Jun 2020 08:00:48 +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 2982B88039 for ; Sun, 21 Jun 2020 08:00:32 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id g10so12121031wmh.4 for ; Sun, 21 Jun 2020 01:00: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=zCgsk7fbw0gzh8lQ4EtbVG0NbfX2KlT5zGV1xGMi8iE=; b=posxTr7p/qcytTMtuh3mQURO1sI3flPX3377EKYHM6t7X/DPngzH+bLx4bnbmSMpo2 NMHem6e01YgFz/ACSV4P8AW38jX5OrWaED5HMuXBDkk6If7Nh56ImSKrMFOI0pJMdKpl +LZFzljHS+VFOI3K48yv0D3/FmWsQ6YgEIi7b63x3YuoLx70mtNM5y6LuoLds0D8N/0d 5Ty/BHosy+5HKDXCLCmXtHv20+NbwMvbgPc58sQNgGaqP2TOUglqRdL4sSQLirjDM1d3 di2wfmMzeVyL8WSlksA+UTHZaMsSdHZswRpEgzhfnFRy7s2X6RyPamtDNmhrjcC0F+Jo YMgg== 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=zCgsk7fbw0gzh8lQ4EtbVG0NbfX2KlT5zGV1xGMi8iE=; b=UTi68ntoKn/Usgy6Qwkg5gSc25CC69ALg1KHG5M7EOxMn3nV/Sbl2wcyo/sP4hPBFD P4hOJjTVCQSfpk64zHu5Qs/PkGUbsRIzNuRe4OPldXgjRchDXCJ+oVo51PiHDORpU/Zo QwgWmu8mzcvCzyM2BQS6SnJ4rKgrx8H825TtJvTMvWYV5kteWudDH+OIuJ8Em8ZXcgZ7 0Sn2lBBPz8RLgtNU6ZiCedTzI6VnTYdsnpbwRZL39j6EAUIhQORGdQlhbYGtHhDyRQX6 dEJ665QAuDaOjnVh1h2U1/VanMTyOhwFVkOkIf+irTK6s7VP6lkr9eT3nlPQFZRghcaH gb9A== X-Gm-Message-State: AOAM5322oiesRMU9mYGr5Nn2OJUr8JDX26k5uj6l8clUFGVlkwm41Oj9 5n0IFbR1At4ywvGMRvz8lHsYA/0VuXk= X-Google-Smtp-Source: ABdhPJz3FKN10dlwkjVJIMpOQxF3qqmb7lnwQN1hCQXlZoGYTowsGX1hNf/4SLyTnf2OZUIPbYEl7g== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr12938015wma.83.1592726430514; Sun, 21 Jun 2020 01:00:30 -0700 (PDT) Received: from vm-xubuntu20.04 ([78.250.207.83]) by smtp.gmail.com with ESMTPSA id e5sm11051327wrs.33.2020.06.21.01.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 01:00:30 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 21 Jun 2020 09:59:59 +0200 Message-Id: <20200621080000.180089-7-francois.perrad@gadz.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200621080000.180089-1-francois.perrad@gadz.org> References: <20200621080000.180089-1-francois.perrad@gadz.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 6/7] package/systemd: add an option BR2_PACKAGE_SYSTEMD_GUEST 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: Christian Stewart , Norbert Lange , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" this option allows a systemd tailored for a guest/container Signed-off-by: Francois Perrad --- package/systemd/Config.in | 14 ++++++++++---- package/systemd/systemd.mk | 6 +++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index dd3b8c534..a8595dce8 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -35,10 +35,10 @@ menuconfig BR2_PACKAGE_SYSTEMD 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 - select BR2_PACKAGE_KMOD_TOOLS - select BR2_TARGET_TZ_INFO + select BR2_PACKAGE_KMOD if !BR2_PACKAGE_SYSTEMD_GUEST + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if !BR2_PACKAGE_SYSTEMD_GUEST # kmod-tools + select BR2_PACKAGE_KMOD_TOOLS if !BR2_PACKAGE_SYSTEMD_GUEST + select BR2_TARGET_TZ_INFO if !BR2_PACKAGE_SYSTEMD_GUEST select BR2_NEEDS_HOST_UTF8_LOCALE select BR2_PACKAGE_HOST_SYSTEMD # for systemctl preset-all, during target-finalize help @@ -90,6 +90,12 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" +config BR2_PACKAGE_SYSTEMD_GUEST + bool "systemd-guest" + default n + help + this option allows a systemd tailored for a guest/container. + config BR2_PACKAGE_SYSTEMD_BOOT bool "systemd-boot" depends on BR2_i386 || BR2_x86_64 diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b7213dd12..c5572c369 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -13,11 +13,15 @@ SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ - kmod \ libcap \ util-linux \ $(TARGET_NLS_DEPENDENCIES) +ifneq ($(BR2_PACKAGE_SYSTEMD_GUEST),y) + SYSTEMD_DEPENDENCIES += kmod +endif + + SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \