From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dC0BB-0002ct-Cb for guix-patches@gnu.org; Sat, 20 May 2017 04:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dC0B8-00036O-7K for guix-patches@gnu.org; Sat, 20 May 2017 04:56:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53216) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dC0B8-00036K-4G for guix-patches@gnu.org; Sat, 20 May 2017 04:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dC0B7-00022K-KD for guix-patches@gnu.org; Sat, 20 May 2017 04:56:01 -0400 Subject: bug#26815: [PATCH v4 3/3] vm: Add UEFI loader to disk images. Resent-Message-ID: References: <87r2zoygoi.fsf@gnu.org> <20170517110522.18106-1-mbakke@fastmail.com> <20170517110522.18106-3-mbakke@fastmail.com> <87ziebtbph.fsf@gnu.org> <877f1ecf00.fsf@fastmail.com> <8737c2cbm5.fsf@fastmail.com> <871srlankf.fsf@gnu.org> <87k25cvn49.fsf@fastmail.com> <87pof4agte.fsf@gmail.com> <87h90gvhz3.fsf@fastmail.com> <87h90g7x5d.fsf@gnu.org> From: Mathieu Othacehe In-reply-to: <87h90g7x5d.fsf@gnu.org> Date: Sat, 20 May 2017 10:55:12 +0200 Message-ID: <87efvj3o27.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 26815-done@debbugs.gnu.org Hi ! > I’m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc62b to > ‘version-0.13.0’ because there are conflicts and I’m not sure how to > resolve them. I just had a look, the following conflict : --8<---------------cut here---------------start------------->8--- <<<<<<< HEAD #:grub.cfg #$grub-configuration) ======= #:grub-efi #$grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer #$(bootloader-installer bootloader)) >>>>>>> ecf5d5376... vm: Add UEFI loader to disk images. --8<---------------cut here---------------end--------------->8--- means that patches b09a8da4a..5641dffb0 are required here. As I agree it is not a good idea to take them into 0.13 release, the only solution left is to rewrite Marius patch on top of a pre-bootloader rework commit. Mathieu