From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eq7Jp-0002l3-Em for guix-patches@gnu.org; Sun, 25 Feb 2018 20:11:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eq7Jm-0007zZ-7t for guix-patches@gnu.org; Sun, 25 Feb 2018 20:11:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eq7Jm-0007yp-3f for guix-patches@gnu.org; Sun, 25 Feb 2018 20:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eq7Jl-0000f4-Rp for guix-patches@gnu.org; Sun, 25 Feb 2018 20:11:01 -0500 Subject: [bug#30604] [PATCH 1/4] gnu: kmod: Split off kmod-minimal. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180225114816.869-1-dannym@scratchpost.org> References: <20180225114557.816-1-dannym@scratchpost.org> <20180225114816.869-1-dannym@scratchpost.org> Date: Mon, 26 Feb 2018 02:10:14 +0100 Message-ID: <87h8q4wo7d.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Danny Milosavljevic , 30604@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Danny Milosavljevic writes: > * 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 monito= red.") > (license license:gpl2+))) >=20=20 > -(define-public kmod > +(define kmod-minimal > (package > + (name "kmod-minimal") > + (version "13") Why this old version? > + (source (origin > + (method url-fetch) > + (uri > + (string-append "mirror://kernel.org/linux/utils/kernel/km= od/" > + "kmod-" version ".tar.xz")) > + (sha256 > + (base32 > + "0mkrklih0f33c3zc4mkk9qqbzy36r18mj9xffd4wi61gpamx6dkc")) > + (patches (search-patches "kmod-13-module-directory.patch")= ))) This patch seems to be missing. > + (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 Lin= ux > +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 wi= th > +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 fil= e 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 Lin= ux > -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 wi= th > -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))))) >=20=20 > (define-public eudev > ;; The post-systemd fork, maintained by Gentoo. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqTXnYACgkQoqBt8qM6 VPpGtAf9HdKJjuRHFJxIT76qB3Yjub3mj5c3LRNhSA1vPnaPEMOXVDDTlq4t8XcR K0oaixbKYcSvSmHJ+Sp17jy+SYpeA1WGGpCxKVsBl8FCKhEYh2ztbgRUtMwjXZyF ZjO15dLd2SU40hWXVabKDeDTZyD9whMZMrbKAmu1OelG9lSPJw7fWfSU8UnZeXJg TflXbAN+9Ikm5ey4kxY/v+IjE60aWd5CRlUqcWVzKzZ7bSmU81r+paUWSe+11V7n 7LoBFm/MwQM3JFkglmSkWsDv/9eQwfm6CI6yV15qChL+MXuSFKzuJNKeETd7TvV9 P8zks8IDY7CA9I3PwJXPEZRuwA7QYw== =YgmH -----END PGP SIGNATURE----- --=-=-=--