public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2021-12-13 16:28 Jakov Smolić
  0 siblings, 0 replies; 12+ messages in thread
From: Jakov Smolić @ 2021-12-13 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ef9d5342526ef4f5c3cdffb5f2ff537bdf7401d1
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 16:27:58 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 16:27:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9d5342

app-emulation/grub-xen-host: Drop EAPI-5 ebuild

Bug: https://bugs.gentoo.org/698916
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../grub-xen-host/grub-xen-host-1.0.ebuild         | 79 ----------------------
 1 file changed, 79 deletions(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
deleted file mode 100644
index 9150a04e8c80..000000000000
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
-HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-boot/grub:2=[grub_platforms_xen]
-	app-emulation/xen-tools:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-RESTRICT="binchecks strip test"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
-		normal (memdisk)/grub.cfg
-	EOF
-
-	cat > "${S}/grub.cfg" <<- EOF || die
-		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
-			multiboot "/boot/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
-			multiboot "/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /boot/grub/grub.cfg ; then
-			echo "Reading (${root})/boot/grub/grub.cfg"
-			configfile /boot/grub/grub.cfg
-		fi
-
-		if search -s -f /grub/grub.cfg ; then
-			echo "Reading (${root})/grub/grub.cfg"
-			configfile /grub/grub.cfg
-		fi
-	EOF
-
-	tar cf memdisk.tar grub.cfg || die "failed to tar"
-
-	local grub_mkimage=grub-mkimage
-	if type grub2-mkimage &> /dev/null; then
-		grub_mkimage=grub2-mkimage
-	fi
-
-	local args=(
-		"${grub_mkimage}"
-		-O x86_64-xen
-		-c grub-bootstrap.cfg
-		-m memdisk.tar
-		-o grub-x86_64-xen.bin
-		/usr/lib/grub/x86_64-xen/*.mod
-	)
-
-	echo "${args[@]}"
-	"${args[@]}" || die "failed to grub-mkimage"
-}
-
-src_install() {
-	exeinto /usr/libexec/xen/bin
-	doexe grub-x86_64-xen.bin
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2024-11-01 16:11 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-11-01 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     90fa7c14195abca32a9986303661a90373aec776
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 16:08:38 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 16:10:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fa7c14

app-emulation/grub-xen-host: drop 1.0-r1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../grub-xen-host/grub-xen-host-1.0-r1.ebuild      | 98 ----------------------
 1 file changed, 98 deletions(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
deleted file mode 100644
index 2aaa8eb6a896..000000000000
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
-HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pvh"
-
-DEPEND="sys-boot/grub:2=[grub_platforms_xen]
-	pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] )
-	app-emulation/xen-tools:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-RESTRICT="binchecks strip test"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
-		normal (memdisk)/grub.cfg
-	EOF
-
-	cat > "${S}/grub.cfg" <<- EOF || die
-		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
-			multiboot "/boot/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
-			multiboot "/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /boot/grub/grub.cfg ; then
-			echo "Reading (${root})/boot/grub/grub.cfg"
-			configfile /boot/grub/grub.cfg
-		fi
-
-		if search -s -f /grub/grub.cfg ; then
-			echo "Reading (${root})/grub/grub.cfg"
-			configfile /grub/grub.cfg
-		fi
-	EOF
-
-	tar cf memdisk.tar grub.cfg || die "failed to tar"
-
-	local grub_mkimage=grub-mkimage
-	if type grub2-mkimage &> /dev/null; then
-		grub_mkimage=grub2-mkimage
-	fi
-
-	local args=(
-		"${grub_mkimage}"
-		-O x86_64-xen
-		-c grub-bootstrap.cfg
-		-m memdisk.tar
-		-o grub-x86_64-xen.bin
-		/usr/lib/grub/x86_64-xen/*.mod
-	)
-
-	echo "${args[@]}"
-	"${args[@]}" || die "failed to grub-mkimage"
-
-	if use pvh; then
-		local args=(
-			"${grub_mkimage}"
-			-O i386-xen_pvh
-			-c grub-bootstrap.cfg
-			-m memdisk.tar
-			-o grub-i386-xen_pvh.bin
-			/usr/lib/grub/i386-xen_pvh/*.mod
-		)
-
-		echo "${args[@]}"
-		"${args[@]}" || die "failed to grub-mkimage"
-	fi
-
-}
-
-src_install() {
-	exeinto /usr/libexec/xen/bin
-	doexe grub-x86_64-xen.bin
-	if use pvh; then
-		doexe grub-i386-xen_pvh.bin
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2022-07-01 16:04 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2022-07-01 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     91ab271d50421af6c6f0b2113876dac187464baf
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 16:04:11 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 16:04:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ab271d

app-emulation/grub-xen-host: stabilize 1.0-r2 for amd64

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
index b8d6cc67d3e4..502d03bee2b3 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pvh"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2022-06-05 15:57 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2022-06-05 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     2d02799150c0c14511a861f3493bc813f6434d25
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 15:56:28 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 15:57:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d027991

app-emulation/grub-xen-host: update EAPI 7 -> 8

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../grub-xen-host/grub-xen-host-1.0-r2.ebuild      | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
new file mode 100644
index 000000000000..b8d6cc67d3e4
--- /dev/null
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
+HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pvh"
+
+DEPEND="
+	sys-boot/grub:2=[grub_platforms_xen]
+	pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="binchecks strip test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
+		normal (memdisk)/grub.cfg
+	EOF
+
+	cat > "${S}/grub.cfg" <<- EOF || die
+		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
+			multiboot "/boot/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
+			multiboot "/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /boot/grub/grub.cfg ; then
+			echo "Reading (${root})/boot/grub/grub.cfg"
+			configfile /boot/grub/grub.cfg
+		fi
+
+		if search -s -f /grub/grub.cfg ; then
+			echo "Reading (${root})/grub/grub.cfg"
+			configfile /grub/grub.cfg
+		fi
+	EOF
+
+	tar cf memdisk.tar grub.cfg || die "failed to tar"
+
+	local grub_mkimage=grub-mkimage
+	if type grub2-mkimage &> /dev/null; then
+		grub_mkimage=grub2-mkimage
+	fi
+
+	local args=(
+		"${grub_mkimage}"
+		-O x86_64-xen
+		-c grub-bootstrap.cfg
+		-m memdisk.tar
+		-p "${EPREFIX}"/usr/lib/grub/x86_64-xen/*.mod
+		-o grub-x86_64-xen.bin
+	)
+
+	echo "${args[@]}"
+	"${args[@]}" || die "failed to grub-mkimage"
+
+	if use pvh; then
+		local args=(
+			"${grub_mkimage}"
+			-O i386-xen_pvh
+			-c grub-bootstrap.cfg
+			-m memdisk.tar
+			-p "${EPREFIX}"/usr/lib/grub/i386-xen_pvh/*.mod
+			-o grub-i386-xen_pvh.bin
+		)
+
+		echo "${args[@]}"
+		"${args[@]}" || die "failed to grub-mkimage"
+	fi
+
+}
+
+src_install() {
+	exeinto /usr/libexec/xen/bin
+	doexe grub-x86_64-xen.bin
+	if use pvh; then
+		doexe grub-i386-xen_pvh.bin
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2022-04-13 19:20 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2022-04-13 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     12b5d5f21c007e63fcee10492d67e82790ee4f44
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 19:20:10 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 19:20:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b5d5f2

app-emulation/grub-xen-host: update HOMEPAGE

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
index e791afc7b611..2aaa8eb6a896 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
-HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
+HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
 SRC_URI=""
 
 LICENSE="BSD-2"


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2021-12-13 16:23 Jakov Smolić
  0 siblings, 0 replies; 12+ messages in thread
From: Jakov Smolić @ 2021-12-13 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9c4805c0715e94e6d2bbc6fb5dac2582a9656605
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 16:23:37 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 16:23:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4805c0

app-emulation/grub-xen-host: Stabilize 1.0-r1 amd64, #698916

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
index 288e12680781..e791afc7b611 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pvh"
 
 DEPEND="sys-boot/grub:2=[grub_platforms_xen]


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2021-10-20  2:07 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-10-20  2:07 UTC (permalink / raw
  To: gentoo-commits

commit:     8f8aa4dfd8fe9dd692e0d8cd462c80742f1c18a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 02:07:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:07:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8aa4df

app-emulation/grub-xen-host: fix IncorrectCopyright

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
index 9a2c9dc09f0..288e1268078 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2021-10-20  2:06 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-10-20  2:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fb9b0ff51ad4a0b9efe1ec4888374181bcbe58de
Author:     Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Mon Feb 17 16:12:17 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:05:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9b0ff5

app-emulation/grub-xen-host: add USE=pvh

Bug: https://bugs.gentoo.org/698916
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/13496
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../grub-xen-host/grub-xen-host-1.0-r1.ebuild      | 98 ++++++++++++++++++++++
 app-emulation/grub-xen-host/metadata.xml           |  3 +
 2 files changed, 101 insertions(+)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
new file mode 100644
index 00000000000..9a2c9dc09f0
--- /dev/null
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
+HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pvh"
+
+DEPEND="sys-boot/grub:2=[grub_platforms_xen]
+	pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] )
+	app-emulation/xen-tools:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="binchecks strip test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
+		normal (memdisk)/grub.cfg
+	EOF
+
+	cat > "${S}/grub.cfg" <<- EOF || die
+		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
+			multiboot "/boot/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
+			multiboot "/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /boot/grub/grub.cfg ; then
+			echo "Reading (${root})/boot/grub/grub.cfg"
+			configfile /boot/grub/grub.cfg
+		fi
+
+		if search -s -f /grub/grub.cfg ; then
+			echo "Reading (${root})/grub/grub.cfg"
+			configfile /grub/grub.cfg
+		fi
+	EOF
+
+	tar cf memdisk.tar grub.cfg || die "failed to tar"
+
+	local grub_mkimage=grub-mkimage
+	if type grub2-mkimage &> /dev/null; then
+		grub_mkimage=grub2-mkimage
+	fi
+
+	local args=(
+		"${grub_mkimage}"
+		-O x86_64-xen
+		-c grub-bootstrap.cfg
+		-m memdisk.tar
+		-o grub-x86_64-xen.bin
+		/usr/lib/grub/x86_64-xen/*.mod
+	)
+
+	echo "${args[@]}"
+	"${args[@]}" || die "failed to grub-mkimage"
+
+	if use pvh; then
+		local args=(
+			"${grub_mkimage}"
+			-O i386-xen_pvh
+			-c grub-bootstrap.cfg
+			-m memdisk.tar
+			-o grub-i386-xen_pvh.bin
+			/usr/lib/grub/i386-xen_pvh/*.mod
+		)
+
+		echo "${args[@]}"
+		"${args[@]}" || die "failed to grub-mkimage"
+	fi
+
+}
+
+src_install() {
+	exeinto /usr/libexec/xen/bin
+	doexe grub-x86_64-xen.bin
+	if use pvh; then
+		doexe grub-i386-xen_pvh.bin
+	fi
+}

diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
index 212093a6f10..485b9cd416b 100644
--- a/app-emulation/grub-xen-host/metadata.xml
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -9,4 +9,7 @@
 		a guest installed PV grub (grub legacy or grub 2) or handle a guest
 		supplied grub 2 config file.
 	</longdescription>
+	<use>
+		<flag name="pvh">Build an additional grub bin for pvh.</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2019-04-14  8:50 Michał Górny
  0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2019-04-14  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     cde8e8b9498d4159c3cd490d0f7d3dd77b0c98d4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 08:50:07 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 08:50:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde8e8b9

app-emulation/grub-xen-host: Replace STRIP_MASK with RESTRICT=strip

While at it, replace QA* with RESTRICT=binchecks and add missing ||die.

Closes: https://bugs.gentoo.org/651420
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 8fe09f145e0..9150a04e8c8 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,22 +18,18 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
-STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-RESTRICT="test"
+RESTRICT="binchecks strip test"
 
 src_configure() {
 	:
 }
 
 src_compile() {
-	cat > "${S}/grub-bootstrap.cfg" <<- EOF
+	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
 		normal (memdisk)/grub.cfg
 	EOF
 
-	cat > "${S}/grub.cfg" <<- EOF
+	cat > "${S}/grub.cfg" <<- EOF || die
 		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
 			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
 			multiboot "/boot/xen/pvboot-x86_64.elf"


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2016-08-08 15:35 Mike Gilbert
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2016-08-08 15:35 UTC (permalink / raw
  To: gentoo-commits

commit:     0faa0ee1778e403d04cba22067e3edaac9c540bd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 15:34:19 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 15:35:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0faa0ee1

app-emulation/grub-xen-host: add support for sys-boot/grub[-multislot]

Package-Manager: portage-2.3.0_p16

 .../grub-xen-host/grub-xen-host-1.0.ebuild         | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 292c338..6ada0a8 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -60,12 +60,22 @@ src_compile() {
 
 	tar cf memdisk.tar grub.cfg || die "failed to tar"
 
-	grub2-mkimage -O x86_64-xen \
-		-c grub-bootstrap.cfg \
-		-m memdisk.tar \
-		-o grub-x86_64-xen.bin \
-		/usr/lib/grub/x86_64-xen/*.mod \
-		|| die "failed to grub-mkimage"
+	local grub_mkimage=grub-mkimage
+	if type grub2-mkimage &> /dev/null; then
+		grub_mkimage=grub2-mkimage
+	fi
+
+	local args=(
+		"${grub_mkimage}"
+		-O x86_64-xen
+		-c grub-bootstrap.cfg
+		-m memdisk.tar
+		-o grub-x86_64-xen.bin
+		/usr/lib/grub/x86_64-xen/*.mod
+	)
+
+	echo "${args[@]}"
+	"${args[@]}" || die "failed to grub-mkimage"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2016-02-06 22:27 Doug Goldstein
  0 siblings, 0 replies; 12+ messages in thread
From: Doug Goldstein @ 2016-02-06 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     20a70888182a436925bd216490873fb702d942e7
Author:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 22:27:12 2016 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 22:27:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a70888

app-emulation/grub-xen-host: update metadata

Package-Manager: portage-2.2.26
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>

 app-emulation/grub-xen-host/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
index d1cd780..bddad78 100644
--- a/app-emulation/grub-xen-host/metadata.xml
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type='project'>
 		<email>xen@gentoo.org</email>
 	</maintainer>
-	<maintainer>
+	<maintainer type='person'>
 		<email>cardoe@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/
@ 2016-02-06 21:42 Doug Goldstein
  0 siblings, 0 replies; 12+ messages in thread
From: Doug Goldstein @ 2016-02-06 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     3387c0a6f28f10d691dee9c96cca9c17c17b62f8
Author:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 20:16:07 2016 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 21:42:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3387c0a6

app-emulation/grub-xen-host: initial version

Initial version to provide a dom0 host PV grub based on grub 2.

Package-Manager: portage-2.2.26
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>

 .../grub-xen-host/grub-xen-host-1.0.ebuild         | 74 ++++++++++++++++++++++
 app-emulation/grub-xen-host/metadata.xml           | 15 +++++
 2 files changed, 89 insertions(+)

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
new file mode 100644
index 0000000..292c338
--- /dev/null
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
+HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-boot/grub:2=[grub_platforms_xen]
+	app-emulation/xen-tools:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
+QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
+QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin"
+QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin"
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	cat > "${S}/grub-bootstrap.cfg" <<- EOF
+		normal (memdisk)/grub.cfg
+	EOF
+
+	cat > "${S}/grub.cfg" <<- EOF
+		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
+			multiboot "/boot/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
+			multiboot "/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /boot/grub/grub.cfg ; then
+			echo "Reading (${root})/boot/grub/grub.cfg"
+			configfile /boot/grub/grub.cfg
+		fi
+
+		if search -s -f /grub/grub.cfg ; then
+			echo "Reading (${root})/grub/grub.cfg"
+			configfile /grub/grub.cfg
+		fi
+	EOF
+
+	tar cf memdisk.tar grub.cfg || die "failed to tar"
+
+	grub2-mkimage -O x86_64-xen \
+		-c grub-bootstrap.cfg \
+		-m memdisk.tar \
+		-o grub-x86_64-xen.bin \
+		/usr/lib/grub/x86_64-xen/*.mod \
+		|| die "failed to grub-mkimage"
+}
+
+src_install() {
+	exeinto /usr/libexec/xen/bin
+	doexe grub-x86_64-xen.bin
+}

diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
new file mode 100644
index 0000000..d1cd780
--- /dev/null
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xen@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		A grub 2 built to run in dom0 which is a PV grub that can chain load
+		a guest installed PV grub (grub legacy or grub 2) or handle a guest
+		supplied grub 2 config file.
+	</longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-11-01 16:11 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-13 16:28 [gentoo-commits] repo/gentoo:master commit in: app-emulation/grub-xen-host/ Jakov Smolić
  -- strict thread matches above, loose matches on Subject: below --
2024-11-01 16:11 Florian Schmaus
2022-07-01 16:04 Florian Schmaus
2022-06-05 15:57 Florian Schmaus
2022-04-13 19:20 Florian Schmaus
2021-12-13 16:23 Jakov Smolić
2021-10-20  2:07 Sam James
2021-10-20  2:06 Sam James
2019-04-14  8:50 Michał Górny
2016-08-08 15:35 Mike Gilbert
2016-02-06 22:27 Doug Goldstein
2016-02-06 21:42 Doug Goldstein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox