From patchwork Mon Sep 23 18:20:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 15441 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 198CE17428; Mon, 23 Sep 2019 21:50:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9845A1741C for ; Mon, 23 Sep 2019 21:50:33 +0100 (BST) Received: from localhost ([::1]:33922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCVI1-0003cR-67 for patchwork@mira.cbaines.net; Mon, 23 Sep 2019 16:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52397) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCTHh-0006Mn-At for guix-patches@gnu.org; Mon, 23 Sep 2019 14:42:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCTHe-00051n-Vn for guix-patches@gnu.org; Mon, 23 Sep 2019 14:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCTHe-00051P-Nx for guix-patches@gnu.org; Mon, 23 Sep 2019 14:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iCTHe-0008WU-KA for guix-patches@gnu.org; Mon, 23 Sep 2019 14:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37493] [PATCH] gnu: Add iwd. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Sep 2019 18:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37493@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156926407432680 (code B ref -1); Mon, 23 Sep 2019 18:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Sep 2019 18:41:14 +0000 Received: from localhost ([127.0.0.1]:37097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCTGo-0008Uw-Nj for submit@debbugs.gnu.org; Mon, 23 Sep 2019 14:41:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:48736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iCSx2-0005vP-3L for submit@debbugs.gnu.org; Mon, 23 Sep 2019 14:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSwz-0000Ju-Sr for guix-patches@gnu.org; Mon, 23 Sep 2019 14:20:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSwv-00052b-Up for guix-patches@gnu.org; Mon, 23 Sep 2019 14:20:41 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:46125) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSwv-00051r-M0 for guix-patches@gnu.org; Mon, 23 Sep 2019 14:20:37 -0400 X-Originating-IP: 85.170.102.177 Received: from localhost (85-170-102-177.rev.numericable.fr [85.170.102.177]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 7B1CD1C0007; Mon, 23 Sep 2019 18:20:33 +0000 (UTC) From: Brice Waegeneire Date: Mon, 23 Sep 2019 20:20:27 +0200 Message-Id: <20190923182027.24257-1-brice@waegenei.re> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Mailman-Approved-At: Mon, 23 Sep 2019 14:41:09 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Mon, 23 Sep 2019 16:50:27 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brice Waegeneire Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (ell): New variable. * gnu/packages/networking.scm (iwd): New variable. * gnu/packages/patches/ell-fix-dbus-tests.patch: New file. --- gnu/packages/linux.scm | 37 +++++++++++ gnu/packages/networking.scm | 56 ++++++++++++++++ gnu/packages/patches/ell-fix-dbus-tests.patch | 65 +++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 gnu/packages/patches/ell-fix-dbus-tests.patch diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 59874b097c..11f2503841 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -5968,3 +5969,39 @@ have to construct the archives directly, without using the archiver.") (description "inputattach dispatches input events from several device types and interfaces and translates so that the X server can use them.") (license license:gpl2+))) + +(define-public ell + (package + (name "ell") + (version "0.23") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/libs/ell/ell.git") + (commit version))) + (sha256 + (base32 + "1qhlcwhn0gj877yss2ymx1aczghlddzb5v9mm1dgp2zliii3jy10")) + (patches (search-patches "ell-fix-dbus-tests.patch")))) + (build-system gnu-build-system) + ;; (arguments + ;; `(#:tests? #f ;kernel/user integration tests are in package "xfstests" + ;; #:phases (modify-phases %standard-phases + ;; (add-after 'install 'install-headers + ;; (lambda _ + ;; (invoke "make" "install-dev")))))) + (inputs + `(("dbus" ,dbus) + ("libtool" ,libtool))) + (native-inputs + `(("autoconf" ,autoconf) + ("pkgconfig" ,pkg-config) + ("automake" ,automake))) + (home-page "https://01.org/ell") + (synopsis "Embedded Linux Library") + (description "The Embedded Linux* Library (ELL) provides core, low-level +functionality for system daemons. It typically has no dependencies other than +the Linux kernel, C standard library, and libdl (for dynamic linking). While +ELL is designed to be efficient and compact enough for use on embedded Linux +platforms, it is not limited to resource-constrained systems.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6bdf7f9e2f..87dd015320 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar +;;; Copyright © 2019 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -2578,3 +2579,58 @@ communication.") (description "FRRouting (FRR) is an IP routing protocol suite which includes protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ") (license license:gpl2+))) + +(define-public iwd + (package + (name "iwd") + (version "0.21") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393")))) + (build-system gnu-build-system) + (inputs + `(("dbus" ,dbus) + ("libtool" ,libtool) + ("ell" ,ell) + ("readline" ,readline))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("pkgconfig" ,pkg-config) + ("python" ,python) + ("openssl" ,openssl))) + (arguments + `(#:configure-flags + (let ((dbus (assoc-ref %outputs "out"))) + (list "--disable-systemd-service" + "--enable-external-ell" + "--enable-hwsim" + "--enable-tools" + "--enable-wired" + "--enable-docs" + "--localstatedir=/var" + (string-append "--with-dbus-datadir=" dbus "/share/") + (string-append "--with-dbus-busdir=" + dbus "/share/dbus-1/system-services"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; Don't try to 'mkdir /var'. + (substitute* "Makefile.in" + (("\\$\\(MKDIR_P\\) -m 700") + "true"))))))) + (home-page "https://git.kernel.org/cgit/network/wireless/iwd.git/") + (synopsis "Internet Wireless Daemon") + (description "iwd is a wireless daemon for Linux written by Intel that +aims to replace WPA supplicant. It optimize resource utilization by not +depending on any external libraries and instead utilizing features provided by +the Linux Kernel to the maximum extent possible.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/patches/ell-fix-dbus-tests.patch b/gnu/packages/patches/ell-fix-dbus-tests.patch new file mode 100644 index 0000000000..b494ba8b43 --- /dev/null +++ b/gnu/packages/patches/ell-fix-dbus-tests.patch @@ -0,0 +1,65 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -140,6 +140,7 @@ + ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES) + + AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \ ++ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \ + -DCERTDIR=\""$(top_builddir)/unit/"\" + + pkgconfigdir = $(libdir)/pkgconfig +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ + + AC_PREFIX_DEFAULT(/usr/local) + ++PKG_PROG_PKG_CONFIG ++ + COMPILER_FLAGS + + AC_LANG_C +@@ -131,6 +133,10 @@ + AC_CHECK_PROG(have_xxd, [xxd], [yes], [no]) + fi + ++PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes, ++ AC_MSG_ERROR(D-Bus is required for running tests)) ++PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir) ++ + AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes") + AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes") + +--- a/unit/test-dbus-message-fds.c ++++ b/unit/test-dbus-message-fds.c +@@ -51,7 +51,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus-properties.c ++++ b/unit/test-dbus-properties.c +@@ -48,7 +48,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus.c ++++ b/unit/test-dbus.c +@@ -45,7 +45,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";