From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40308) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6aMZ-0002Yj-Nm for guix-patches@gnu.org; Tue, 25 Feb 2020 08:35:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6aMY-0002Ox-JV for guix-patches@gnu.org; Tue, 25 Feb 2020 08:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6aMY-0002Ol-Gv for guix-patches@gnu.org; Tue, 25 Feb 2020 08:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6aMY-0001Oq-Dm for guix-patches@gnu.org; Tue, 25 Feb 2020 08:35:02 -0500 Subject: [bug#37868] [PATCH v4] system: Add kernel-module-packages to operating-system. Resent-Message-ID: Date: Tue, 25 Feb 2020 14:34:35 +0100 From: Danny Milosavljevic Message-ID: <20200225143435.756a5ed3@scratchpost.org> In-Reply-To: <20200225123245.724af21e@scratchpost.org> References: <20200218094207.6196-1-dannym@scratchpost.org> <20200225105549.30115-1-dannym@scratchpost.org> <20200225123245.724af21e@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/o/_uTLQy0bTiexqaI.fBMrx"; protocol="application/pgp-signature"; micalg=pgp-sha256 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: 37868@debbugs.gnu.org, ludo@gnu.org, Mark H Weaver --Sig_/o/_uTLQy0bTiexqaI.fBMrx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable > I think that's because the Linux kernel linux-libre we build already has = those > files. Those files in linux-libre are stale cache files when you have ex= tra > modules (because they don't list those extra modules). It is. Setting DEPMOD=3Dtrue in the "install" phase of make-linux-libre* m= akes almost all of those go away, except for the ones for "build" and "source". The latter point to /tmp/guix-build*linux-libre*, so we could just remove t= hose, too. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 78182555c1..d1be57fded 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -760,12 +760,14 @@ for ARCH and optionally VARIANT, or #f if there is no= such configuration." ;; Install kernel modules (mkdir-p moddir) (invoke "make" - (string-append "DEPMOD=3D" kmod "/bin/depmod") + "DEPMOD=3Dtrue" (string-append "MODULE_DIR=3D" moddir) (string-append "INSTALL_PATH=3D" out) (string-append "INSTALL_MOD_PATH=3D" out) "INSTALL_MOD_STRIP=3D1" - "modules_install"))))) + "modules_install") + ;; TODO: delete-file moddir/*/build, moddir/*/source (they = are symlinks to tmp files anyway) + )))) #:tests? #f)) (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") --Sig_/o/_uTLQy0bTiexqaI.fBMrx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl5VImsACgkQ5xo1VCww uqUjQwf/csGxZg4o1PfW3wHH2gaIZ5TpZVQLEMnWIHkxPAeOskO6Z3qXVl9HYNt8 4My0oTFdaXjbkUkSQYjNzkfakiV5PPq3z4VLWS/TSRC05xoVJ94UWtfFZvl2ZxYK Ttp9en6JLryd9kz/znAjZO4rW99PI7FUxXqNtTNuadYGik3kFYvU//4mlYTnZlZK ypH3cTZ8OrUY7+UCJG1rpgnnm1kHp1+ixUB9dRjOZxIoBF594IJGujA+UvoGXu5b zbRIc39h89ibQtE1QBJr/F/1mHVCnHSnPQ3C+uZGV6oNTsnJkIYvzSGDWWNa4Jy7 f2yXvW/LwawXYeSC/hOnAmKUTED4Zw== =Fbza -----END PGP SIGNATURE----- --Sig_/o/_uTLQy0bTiexqaI.fBMrx--