From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F3F7138334 for ; Thu, 5 Jul 2018 14:08:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60C34E0898; Thu, 5 Jul 2018 14:08:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11E11E0898 for ; Thu, 5 Jul 2018 14:08:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A22ED335C7F for ; Thu, 5 Jul 2018 14:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 948A82E5 for ; Thu, 5 Jul 2018 14:08:33 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1530798830.4bf27313d39ee0f7dbff576718cb855500d74fd9.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/systemrescuecd-x86-grub/files/, sys-boot/systemrescuecd-x86-grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild X-VCS-Directories: sys-boot/systemrescuecd-x86-grub/files/ sys-boot/systemrescuecd-x86-grub/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 4bf27313d39ee0f7dbff576718cb855500d74fd9 X-VCS-Branch: master Date: Thu, 5 Jul 2018 14:08:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ae4f0a7a-1686-41e5-aa18-ed9d4f10801e X-Archives-Hash: 1224696d47e96fe2f9688718c6a62428 commit: 4bf27313d39ee0f7dbff576718cb855500d74fd9 Author: Ulrich Müller gentoo org> AuthorDate: Thu Jul 5 13:53:50 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Jul 5 13:53:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf27313 sys-boot/systemrescuecd-x86-grub: Fix path of ISO image. Also bump EAPI to 7. Non-maintainer commit. Acked by mgorny. Package-Manager: Portage-2.3.41, Repoman-2.3.9 sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub | 10 +++++----- ...6-grub-0.1.ebuild => systemrescuecd-x86-grub-0.1-r1.ebuild} | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub index e9695c4b482..269b1eb76ad 100644 --- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub +++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 . /usr/share/grub/grub-mkconfig_lib @@ -32,28 +32,28 @@ if [ -f "${srcd}" ]; then submenu "${longname}" --class submenu { menuentry "${longname} (32bit standard${bootops}" --class rescue { ${grub_string} - set isofile=${srcd} + set isofile=${path} loopback loop \${isofile} linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} initrd (loop)/isolinux/initram.igz } menuentry "${longname} (64bit standard${bootops}" --class rescue { ${grub_string} - set isofile=${srcd} + set isofile=${path} loopback loop \${isofile} linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} initrd (loop)/isolinux/initram.igz } menuentry "${longname} (32bit alternative${bootops}" --class rescue { ${grub_string} - set isofile=${srcd} + set isofile=${path} loopback loop \${isofile} linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} initrd (loop)/isolinux/initram.igz } menuentry "${longname} (64bit alternative${bootops}" --class rescue { ${grub_string} - set isofile=${srcd} + set isofile=${path} loopback loop \${isofile} linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} initrd (loop)/isolinux/initram.igz diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild similarity index 92% rename from sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild rename to sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild index 3a5d11ae858..80a82041913 100644 --- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild +++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86" HOMEPAGE="http://www.sysresccd.org/" @@ -10,7 +10,6 @@ SRC_URI="" LICENSE="GPL-2" SLOT=0 KEYWORDS="~amd64 ~x86" -IUSE="" S=${WORKDIR}