From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/systemrescuecd-x86-grub/files/, sys-boot/systemrescuecd-x86-grub/
Date: Thu, 5 Jul 2018 14:08:33 +0000 (UTC) [thread overview]
Message-ID: <1530798830.4bf27313d39ee0f7dbff576718cb855500d74fd9.ulm@gentoo> (raw)
commit: 4bf27313d39ee0f7dbff576718cb855500d74fd9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 5 13:53:50 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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}
reply other threads:[~2018-07-05 14:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530798830.4bf27313d39ee0f7dbff576718cb855500d74fd9.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox