From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZihL-0002W9-J3 for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZihG-0007F4-NX for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZihG-0007Er-JN for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gZihG-00033Y-DM for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:02 -0500 Subject: [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZigI-000226-Vz for guix-patches@gnu.org; Wed, 19 Dec 2018 15:43:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZigE-00069r-F7 for guix-patches@gnu.org; Wed, 19 Dec 2018 15:43:02 -0500 Received: from aibo.runbox.com ([91.220.196.211]:60962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZigE-00067J-1S for guix-patches@gnu.org; Wed, 19 Dec 2018 15:42:58 -0500 Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gZig9-0007RJ-Nn for guix-patches@gnu.org; Wed, 19 Dec 2018 21:42:53 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gZig9-0005Q1-Me for guix-patches@gnu.org; Wed, 19 Dec 2018 21:42:53 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); for ; Wed, 19 Dec 2018 20:42:53 GMT From: Date: Wed, 19 Dec 2018 20:42:53 +0000 (GMT) Content-Type: multipart/mixed; boundary="----------=_1545252173-20423-0" Message-Id: 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: 33806@debbugs.gnu.org This is a multi-part message in MIME format... ------------=_1545252173-20423-0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I modified the 'kernel->boot-label' function in gnu/system.scm to check if = the kernel passed to it is a regular package, and if it isn't then it will = try to get the package name and version using 'inferior-package-name' and '= inferior-package-version'. Note: I wasn't sure if the hack at the beginning of this patch was neccessa= ry and I didn't add it: http://git.savannah.gnu.org/cgit/guix.git/commit/?i= d=3D811b21fb15d36b06fde994ca7ef5916a9a19f250 ``` (define inferiors-loaded? ;; This hack allows us to provide seamless integration for inferior ;; packages while not having a hard dependency on (guix inferior). (resolve-module '(guix inferior) #f #f #:ensure #f)) (define (inferior->entry) (module-ref (resolve-interface '(guix inferior)) 'inferior-package->manifest-entry)) ``` This is the only issue preventing using an inferior package as a kernel, wh= ich is very useful as it means you can avoid recompiling a custom kernel wh= en you reconfigure the system with a newer guix revision that changes the k= ernel package dependencies.= ------------=_1545252173-20423-0 Content-Type: text/x-patch; name="=?UTF-8?Q?0001-system-kernel-boot-label-now-accepts-inferior-packag.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?0001-system-kernel-boot-label-now-accepts-inferior-packag.patch?=" Content-Transfer-Encoding: base64 Content-ID: <990ec5749af6370e225dfe07dc6bd092> RnJvbSA2YzBiYmFhMGE3M2Y0YzYwNDMyMTFkZjZhZjEwMDg3N2RjOWE0MDk0 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQa2lsbCAtOSA8cGtp bGw5QHJ1bmJveC5jb20+CkRhdGU6IFdlZCwgMTkgRGVjIDIwMTggMjA6MjI6 MjAgKzAwMDAKU3ViamVjdDogW1BBVENIXSBzeXN0ZW06ICdrZXJuZWwtPmJv b3QtbGFiZWwnIG5vdyBhY2NlcHRzIGluZmVyaW9yIHBhY2thZ2VzLgoKKiBn bnUvc3lzdGVtLnNjbSAoa2VybmVsLT5ib290LWxhYmVsKTogR2V0IHBhY2th Z2UgbmFtZSBhbmQgdmVyc2lvbgp1c2luZyB0aGUgZnVuY3Rpb25zIGZvciBp bmZlcmlvciBwYWNrYWdlcyBpZiB0aGUga2VybmVsIGlzIG5vdCBhCnJlZ3Vs YXIgcGFja2FnZS4KLS0tCiBnbnUvc3lzdGVtLnNjbSB8IDE0ICsrKysrKysr KystLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvc3lzdGVtLnNjbSBiL2du dS9zeXN0ZW0uc2NtCmluZGV4IGE1YThmNDBkNi4uYWZlMzkyNzhkIDEwMDY0 NAotLS0gYS9nbnUvc3lzdGVtLnNjbQorKysgYi9nbnUvc3lzdGVtLnNjbQpA QCAtMjEsNiArMjEsNyBAQAogOzs7IGFsb25nIHdpdGggR05VIEd1aXguICBJ ZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCiAK IChkZWZpbmUtbW9kdWxlIChnbnUgc3lzdGVtKQorICAjOnVzZS1tb2R1bGUg KGd1aXggaW5mZXJpb3IpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBzdG9yZSkK ICAgIzp1c2UtbW9kdWxlIChndWl4IG1vbmFkcykKICAgIzp1c2UtbW9kdWxl IChndWl4IGdleHApCkBAIC05MDUsMTAgKzkwNiwxNSBAQCBsaXN0ZWQgaW4g T1MuICBUaGUgQyBsaWJyYXJ5IGV4cGVjdHMgdG8gZmluZCBpdCB1bmRlcgog CiAoZGVmaW5lIChrZXJuZWwtPmJvb3QtbGFiZWwga2VybmVsKQogICAiUmV0 dXJuIGEgbGFiZWwgZm9yIHRoZSBib290bG9hZGVyIG1lbnUgZW50cnkgdGhh dCBib290cyBLRVJORUwuIgotICAoc3RyaW5nLWFwcGVuZCAiR05VIHdpdGgg IgotICAgICAgICAgICAgICAgICAoc3RyaW5nLXRpdGxlY2FzZSAocGFja2Fn ZS1uYW1lIGtlcm5lbCkpICIgIgotICAgICAgICAgICAgICAgICAocGFja2Fn ZS12ZXJzaW9uIGtlcm5lbCkKLSAgICAgICAgICAgICAgICAgIiAoYmV0YSki KSkKKyAgKGlmIChwYWNrYWdlPyBrZXJuZWwpCisgICAgICAoc3RyaW5nLWFw cGVuZCAiR05VIHdpdGggIgorICAgICAgICAgICAgICAgICAgICAgKHN0cmlu Zy10aXRsZWNhc2UgKHBhY2thZ2UtbmFtZSBrZXJuZWwpKSAiICIKKyAgICAg ICAgICAgICAgICAgICAgIChwYWNrYWdlLXZlcnNpb24ga2VybmVsKQorICAg ICAgICAgICAgICAgICAgICAgIiAoYmV0YSkiKQorICAgICAgKHN0cmluZy1h cHBlbmQgIkdOVSB3aXRoICIKKyAgICAgICAgICAgICAgICAgICAgIChzdHJp bmctdGl0bGVjYXNlIChpbmZlcmlvci1wYWNrYWdlLW5hbWUga2VybmVsKSkK KyAgICAgICAgICAgICAgICAgICAgIChpbmZlcmlvci1wYWNrYWdlLXZlcnNp b24ga2VybmVsKQorICAgICAgICAgICAgICAgICAgICAgIiAoYmV0YSkiKSkp CiAKIChkZWZpbmUgKHN0b3JlLWZpbGUtc3lzdGVtIGZpbGUtc3lzdGVtcykK ICAgIlJldHVybiB0aGUgZmlsZSBzeXN0ZW0gb2JqZWN0IGFtb25nIEZJTEUt U1lTVEVNUyB0aGF0IGNvbnRhaW5zIHRoZSBzdG9yZS4iCi0tIAoyLjE5LjIK Cg== ------------=_1545252173-20423-0--