From patchwork Thu Feb 25 21:55:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabe Evans X-Patchwork-Id: 588392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id ADFB4140556 for ; Fri, 26 Feb 2016 08:57:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=hashrabbit.co header.i=@hashrabbit.co header.b=DsKE3oQ8; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C574995D3E; Thu, 25 Feb 2016 21:57:20 +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 Dkh2KGLKHrxZ; Thu, 25 Feb 2016 21:57:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DBCB095D3A; Thu, 25 Feb 2016 21:57:19 +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 AF9FD1CF4D3 for ; Thu, 25 Feb 2016 21:57:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8DF683171F for ; Thu, 25 Feb 2016 21:57: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 CEVqfdqTRBK8 for ; Thu, 25 Feb 2016 21:57:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by silver.osuosl.org (Postfix) with ESMTPS id BECFE31418 for ; Thu, 25 Feb 2016 21:57:01 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id ho8so39944228pac.2 for ; Thu, 25 Feb 2016 13:57:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hashrabbit.co; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qFPznJ3c4Y6OBFE9n77EChaXsmcUQ+6/xfdL8tO1J0g=; b=DsKE3oQ8fv5kShje96WXOs+4fpSanXZM5raA+UBkbxqCiVxahadBDDB9RZ1tOzfCf8 ssQ/MF2GYqu7qaZkBjq9Wo5v7QX71NjJ9WoCJbD5rWCVM8p69mejIhD3vRgrke25sB5c ctdg4ldtiHgpliqIREjjBIvDyuCuL7MF2sv0s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qFPznJ3c4Y6OBFE9n77EChaXsmcUQ+6/xfdL8tO1J0g=; b=fRkWXgou84EN5AVIl23kU+NGF/OH9CBAybk2TOCCgzPIpiexRdMu8yJgd1EeGEgPXp 9FAFVOLSSAxa40qlbH1dScWca98BicvTi1F0KFwtmdjpIXJoND1JOcI9bJXCfjJ74XQZ 7FKGF6NxZ9J5y2I2c5aH4edkGiSMA74Wa33sBT5YZe1JxjG4n83w/GIvmZ5cgVdK5XV7 inZJYi9uY+LTtIKMT6sNf7AB+FmMGZk/GQyP4GP1MPnrPOAPfx/ijp8UAxzkU3B0eYJ8 Yq/2bqgP57NEASCxOMyO5ul5qfXddmi7mcqvCueRtZSgCpfMnNxs1bMHUn7j6rOIIY9X u3rw== X-Gm-Message-State: AG10YOT+np39u4Oc6zno0ASB2HQkXjPbtdYViQLbJi5L5Ip5Mz3EPSs8C/Mqttfs+D3D7A== X-Received: by 10.66.252.100 with SMTP id zr4mr65140779pac.111.1456437421564; Thu, 25 Feb 2016 13:57:01 -0800 (PST) Received: from lab.us-west-1.compute.internal (ec2-54-183-105-171.us-west-1.compute.amazonaws.com. [54.183.105.171]) by smtp.gmail.com with ESMTPSA id r77sm14342649pfa.47.2016.02.25.13.57.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Feb 2016 13:57:01 -0800 (PST) From: Gabe Evans To: buildroot@buildroot.org Date: Thu, 25 Feb 2016 21:55:11 +0000 Message-Id: <1456437341-19025-3-git-send-email-gabe@hashrabbit.co> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456437341-19025-1-git-send-email-gabe@hashrabbit.co> References: <1456437341-19025-1-git-send-email-gabe@hashrabbit.co> Subject: [Buildroot] [PATCH 02/32] package/systemd: remove BR2_PACKAGE_SYSTEMD_ALL_EXTRAS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The option was a bit misleading since it only selected additional libraries without --enable/disabling any features. Including all of them here would add a lot of bloat so instead, it is replaced with notes detailing which features each library enables. Signed-off-by: Gabe Evans --- package/systemd/Config.in | 11 +++-------- package/systemd/systemd.mk | 16 ++++++++++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index f7fc3bb..1972b1d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -56,6 +56,9 @@ config BR2_PACKAGE_SYSTEMD The selection of other packages will enable some features: - acl package will add support for multi-seat. + - xz package will add compression support in journal and coredump. + - libgcrypt package will add support for journal sealing and resolved + DNSSEC verification. http://freedesktop.org/wiki/Software/systemd @@ -64,14 +67,6 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" -config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS - bool "enable all extras" - select BR2_PACKAGE_XZ - select BR2_PACKAGE_LIBGCRYPT - help - Enable extra features for Systemd: journal compression and - signing. - config BR2_PACKAGE_SYSTEMD_KDBUS bool "enable kdbus support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 05121cf..7a1baf5 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -76,16 +76,20 @@ else SYSTEMD_CONF_OPTS += --disable-kdbus endif -ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y) -SYSTEMD_DEPENDENCIES += xz libgcrypt +ifeq ($(BR2_PACKAGE_XZ),y) +SYSTEMD_DEPENDENCIES += xz +SYSTEMD_CONF_OPTS += --enable-xz +else +SYSTEMD_CONF_OPTS += --disable-xz +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +SYSTEMD_DEPENDENCIES += libgcrypt SYSTEMD_CONF_OPTS += \ - --enable-xz \ --enable-gcrypt \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr else -SYSTEMD_CONF_OPTS += \ - --disable-xz \ - --disable-gcrypt +SYSTEMD_CONF_OPTS += --disable-gcrypt endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)