From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epunh-000101-Pb for guix-patches@gnu.org; Sun, 25 Feb 2018 06:49:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epune-0000nt-Lh for guix-patches@gnu.org; Sun, 25 Feb 2018 06:49:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51589) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1epune-0000nF-He for guix-patches@gnu.org; Sun, 25 Feb 2018 06:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1epune-0003gl-At for guix-patches@gnu.org; Sun, 25 Feb 2018 06:49:02 -0500 Subject: [bug#30604] [PATCH 1/4] gnu: kmod: Split off kmod-minimal. Resent-Message-ID: From: Danny Milosavljevic Date: Sun, 25 Feb 2018 12:48:13 +0100 Message-Id: <20180225114816.869-1-dannym@scratchpost.org> In-Reply-To: <20180225114557.816-1-dannym@scratchpost.org> References: <20180225114557.816-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30604@debbugs.gnu.org * gnu/packages/linux.scm (kmod-minimal): New variable. (kmod): Modify. --- gnu/packages/linux.scm | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 238398e84..1f8bf3050 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1933,8 +1933,35 @@ for systems using the Linux kernel. This includes commands such as to use Linux' inotify mechanism, which allows file accesses to be monitored.") (license license:gpl2+))) -(define-public kmod +(define kmod-minimal (package + (name "kmod-minimal") + (version "13") + (source (origin + (method url-fetch) + (uri + (string-append "mirror://kernel.org/linux/utils/kernel/kmod/" + "kmod-" version ".tar.xz")) + (sha256 + (base32 + "0mkrklih0f33c3zc4mkk9qqbzy36r18mj9xffd4wi61gpamx6dkc")) + (patches (search-patches "kmod-13-module-directory.patch")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ; FIXME: Investigate test failures + (home-page "https://www.kernel.org/") + (synopsis "Kernel module tools") + (description "Kmod is a set of tools to handle common tasks with Linux +kernel modules like insert, remove, list, check properties, resolve +dependencies and aliases. + +These tools are designed on top of libkmod, a library that is shipped with +kmod. The aim is to be compatible with tools, configurations and indices +from the module-init-tools project.") + (license license:gpl2+))) ; library under lgpl2.1+ + +(define-public kmod + (package (inherit kmod-minimal) (name "kmod") (version "24") (source (origin @@ -1946,15 +1973,14 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (base32 "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1")) (patches (search-patches "kmod-module-directory.patch")))) - (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("xz" ,xz) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; FIXME: Investigate test failures - #:configure-flags '("--with-xz" "--with-zlib") + `(#:configure-flags '("--with-xz" "--with-zlib") + #:tests? #f ; FIXME: Investigate test failures #:phases (alist-cons-after 'install 'install-modprobe&co (lambda* (#:key outputs #:allow-other-keys) @@ -1964,18 +1990,9 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (symlink "kmod" (string-append bin "/" tool))) '("insmod" "rmmod" "lsmod" "modprobe" - "modinfo" "depmod")))) - %standard-phases))) - (home-page "https://www.kernel.org/") - (synopsis "Kernel module tools") - (description "Kmod is a set of tools to handle common tasks with Linux -kernel modules like insert, remove, list, check properties, resolve -dependencies and aliases. - -These tools are designed on top of libkmod, a library that is shipped with -kmod. The aim is to be compatible with tools, configurations and indices -from the module-init-tools project.") - (license license:gpl2+))) ; library under lgpl2.1+ + "modinfo" "depmod")) + #t)) + %standard-phases))))) (define-public eudev ;; The post-systemd fork, maintained by Gentoo.