From patchwork Sat Jun 22 07:11:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2325 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 9582D884607 for ; Fri, 21 Jun 2019 22:11:40 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45VrwC5WMHz5KKZv; Fri, 21 Jun 2019 22:11:39 +0100 (BST) Received: from tuxedo.tremer.co.uk (unknown [88.215.19.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45Vrw85fRKz581h0; Fri, 21 Jun 2019 22:11:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1561151497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zuSMV/J3MmNcvGO7gLmQv47DbUZtreoGkHvbTMxmL70=; b=oV8UjaN9Zl3fq9P4d2YKWc/+Q3xKmmF5P+i/0V5zgP00WhIOWGIduwcptbJzL41+dNiMPF EWq/RpPF7i7HNogZi8N+dkZ4EyPFrhxOBqOlFWw4VwTqhnGPz7u+hRkzmNs7sKLM7aZ/p0 GCNfBTONWamtVF41DukBNppa32lfSp603P7Op8s3P7yamStM6/zE8OKA4+ZymTNm9XA2lb NS4BNX05pFGXRA3daFdoPdTduAzavcY4jgJDEYJlbFgxKW4kfvPCUt091emw9NU4u6NIEj buIPLH5FC47h3oShOSeAWAfHr7HIfSywqEc/OYjirzWoiC0ysrbw7jLL5W2MZg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1561151497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zuSMV/J3MmNcvGO7gLmQv47DbUZtreoGkHvbTMxmL70=; b=B21SIiyB9msVD1gt6XLisjy4TXjwl00ny6/tjed9Eu5FoviNE0WDdd/rgoxpp6Lric66tx gBBux04k6C/YDRBg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] systemd: Drop systemd-units package. Date: Fri, 21 Jun 2019 23:11:31 +0200 Message-Id: <20190621211133.7404-1-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes * Rework build process to use meson and ninja macros. Signed-off-by: Stefan Schantl --- systemd/systemd.nm | 61 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a1c3677d0..25bbd99cf 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 242 -release = 2 +release = 3 maintainer = Stefan Schantl groups = System/Base @@ -52,15 +52,16 @@ build libblkid-devel libcap-devel libgcrypt-devel - libmount-devel - libuuid-devel + libmount-devel >= 2.34-2 + libuuid-devel >= 2.34-2 m4 - meson - ninja >= 1.5 + meson >= 0.50.1 + ninja >= 1.9.0 pam-devel pciutils-devel python3-devel python3-lxml + setup >= 3.0-13 usbutils vala xz-devel @@ -95,10 +96,10 @@ build build # Call meson and pass configure options. - meson --buildtype=plain %{configure_options} . build + %{meson} %{configure_options} # Call ninja to start build - ninja -v %{PARALLELISMFLAGS} -C build + %{meson_build} end test @@ -113,11 +114,8 @@ build end install - # Export destdir. - export DESTDIR=%{BUILDROOT} - - # Call ninja to perform installation - ninja install -v %{PARALLELISMFLAGS} -C build + # Install systemd. + %{meson_install} # Create folder in log to store the journal. mkdir -pv %{BUILDROOT}/var/log/journal @@ -242,7 +240,6 @@ packages python-dbus python-gobject3 %{name}-libs=%{thisver} - %{name}-units=%{thisver} util-linux>=2.19 end @@ -269,6 +266,7 @@ packages obsoletes udev < 183 + systemd-units <= 242 end configfiles @@ -339,43 +337,6 @@ packages end end - # Package information for systemd-units - package %{name}-units - summary = Configuration files, directories and installation tool for systemd. - description - This package contains all needed configuration files, directories - and installation / configuration tool for systemd. - end - - prerequires - /bin/sh - coreutils - end - - provides - /bin/systemctl - end - - conflicts - filesystem < 002 - end - - files - %{sysconfdir}/etc/systemd/system - %{sysconfdir}/tmpfiles.d - %{sysconfdir}/bash_completion.d/systemctl-bash-completion.sh - %{unitdir} - %{bindir}/systemctl - %{bindir}/systemd-tmpfiles - %{mandir}/man1/systemctl.* - end - - script postup - # Reload service files - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : - end - end - package %{name}-libs template LIBS From patchwork Sat Jun 22 07:11:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2326 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 7186E884607 for ; Fri, 21 Jun 2019 22:11:44 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45VrwH6kNsz5KKZd; Fri, 21 Jun 2019 22:11:43 +0100 (BST) Received: from tuxedo.tremer.co.uk (unknown [88.215.19.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45VrwC4JzJz5KKZZ; Fri, 21 Jun 2019 22:11:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1561151499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TxIRFR3U9eYSylVMwpliYe5UqTaxEQE8J8k9/yH1Vbs=; b=t3sa1iXgCa4i1PmoXONHIcVCqkfwOyR2GkBB51mamJ8IsXaT1t34+ctdepX+0sZWqbbCF2 xDMieca4wgyc/+DVbAaFsbnzq7HLREC5ZXT1O1XCMENHCSN6CjgOA9mIvWMq21lF9yKVyo HHSNBejvrS3H19JelI+VOJ0PBFIS8QJiZvQgWILJgpASJYF+tueaAg6bsmeMLtKG+JgRRQ awlvesfLQZVAnngFRsFamjXsaSrnKLE9+ETF46Y00rVR6Id4Wq7tdA+KdptSSWLW3UPnjq /paCgyJFFdEz9AnylLaiHUXdzNttnW+GGYiolA+L2I1mdFi1hxa1C1iEfqbZ8A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1561151499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TxIRFR3U9eYSylVMwpliYe5UqTaxEQE8J8k9/yH1Vbs=; b=2m3fXr5xQ9S2MBTeIL7YCr94QLOP5+RGtPhQaLG5olW1s0RLn3GcnDiqaKPlpteYHIRkdT JMHX9V1xNPLcxsBg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/2] systemd: Enable libseccomp support Date: Fri, 21 Jun 2019 23:11:32 +0200 Message-Id: <20190621211133.7404-2-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190621211133.7404-1-stefan.schantl@ipfire.org> References: <20190621211133.7404-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes Signed-off-by: Stefan Schantl --- systemd/systemd.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 25bbd99cf..cd82ba000 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 242 -release = 3 +release = 4 maintainer = Stefan Schantl groups = System/Base @@ -53,6 +53,7 @@ build libcap-devel libgcrypt-devel libmount-devel >= 2.34-2 + libseccomp-devel libuuid-devel >= 2.34-2 m4 meson >= 0.50.1