From patchwork Wed Oct 14 15:12:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nosthoff X-Patchwork-Id: 1382210 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=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=heine.tech header.i=@heine.tech header.a=rsa-sha256 header.s=dkim header.b=RlUlf9Ew; 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 4CBGC30F1fz9sVJ for ; Thu, 15 Oct 2020 02:13:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3FB968808B; Wed, 14 Oct 2020 15:13:32 +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 trNfhUxmpPrx; Wed, 14 Oct 2020 15:13:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DF5748762A; Wed, 14 Oct 2020 15:13:29 +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 A86391BF484 for ; Wed, 14 Oct 2020 15:13:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9C2FA2E28C for ; Wed, 14 Oct 2020 15:13:28 +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 59OiOhiNECLM for ; Wed, 14 Oct 2020 15:13:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.heine.tech (mail.heine.tech [195.201.24.99]) by silver.osuosl.org (Postfix) with ESMTPS id 240C82E284 for ; Wed, 14 Oct 2020 15:13:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9CF0218150E; Wed, 14 Oct 2020 17:13:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heine.tech; s=dkim; t=1602688402; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=vrRFjJf91KKJpPkYjxG/ODu4wbfTDH+IB/iyw315ilw=; b=RlUlf9EwBfuhGOM0fuuiNO8ute0eKYbWzDW9pjRb3TbjmVuZX6JOcZZDlkPN4MUcjsJhBH ngPwGjPc5FttCKOGuhEec29s6nWhom8OtOmLY4GGk5Qrhb6EqTXmQtmgC1vWKLYKAwApmR qWHSOv9bKCURhjjS7uwCsnrmsQxcwGI= To: buildroot@buildroot.org Date: Wed, 14 Oct 2020 17:12:50 +0200 Message-Id: <20201014151249.18330-3-buildroot@heine.tech> In-Reply-To: <20201014151249.18330-1-buildroot@heine.tech> References: <20201014151249.18330-1-buildroot@heine.tech> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [Buildroot] [PATCH 2/2] package/systemd: group all journal-remote tools 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: , From: Michael Nosthoff via buildroot Reply-To: Michael Nosthoff Cc: Michael Nosthoff , goodmenzy@gmail.com, thomas.petazzoni@bootlin.com, Norbert Lange , yann.morin.1998@free.fr, Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The -Dremote=true flag enables three tools. systemd-journal-gatewayd, systemd-journal-remote and systemd-journal-upload. It is not possible with simple means to install them seperately. So use the systemd-journal-remote option do enable or disable them all together. Drop systemd-journal-gatewayd option and add it to legacy. Fixes: #12301 Signed-off-by: Michael Nosthoff --- Config.in.legacy | 7 +++++++ package/systemd/Config.in | 28 ++++++++++++---------------- package/systemd/systemd.mk | 13 ++++--------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 95c2fb33b3..f6c3c626e8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2020.11" +config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY + bool "systemd-journal-gatewayd now in systemd-journal-remote" + select BR2_PACKAGE_LIBMICROHTTPD + help + all system journal remote programs are now + grouped in systemd-journal-remote + config BR2_TARGET_UBOOT_BOOT_SCRIPT bool "u-boot script generation was moved" select BR2_LEGACY diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 7956370b83..ec34478e3d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -141,29 +141,25 @@ config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH default "x64" if BR2_x86_64 depends on BR2_PACKAGE_SYSTEMD_BOOT -config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - bool "HTTP server for journal events" +config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + bool "enable journal remote tools" + select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMICROHTTPD help - systemd-journal-gatewayd serves journal events over the - network. Clients must connect using HTTP. The server - listens on port 19531 by default. + journal remote functionality adds three tools: - http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html + systemd-journal-gatewayd serves journal events over the + network. -config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE - bool "enable systemd-journal-remote" - depends on BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - select BR2_PACKAGE_LIBCURL - help systemd-journal-remote is a command to receive serialized - journal events and store them to journal files. Input - streams are in the Journal Export Format[1], i.e. like the - output from journalctl --output=export. For transport over - the network, this serialized stream is usually carried over - an HTTPS connection. + journal events and store them to journal files. + + systemd-journal-upload will upload journal entries to the + URL specified with --url=. + https://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.service.html + https://www.freedesktop.org/software/systemd/man/systemd-journal-upload.html config BR2_PACKAGE_SYSTEMD_BACKLIGHT bool "enable backlight support" diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b684f538a8..6f04283bdc 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -240,18 +240,13 @@ else SYSTEMD_CONF_OPTS += -Danalyze=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) -SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += -Dmicrohttpd=true -else -SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -endif - ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) -SYSTEMD_CONF_OPTS += -Dremote=true +# remote also depends on libcurl, this is already added above. +SYSTEMD_DEPENDENCIES += libmicrohttpd +SYSTEMD_CONF_OPTS += -Dremote=true -Dmicrohttpd=true SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else -SYSTEMD_CONF_OPTS += -Dremote=false +SYSTEMD_CONF_OPTS += -Dremote=false -Dmicrohttpd=false endif ifeq ($(BR2_PACKAGE_LIBQRENCODE),y)