[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: b34b0909d5b6236af890a93171026607ed176ac4
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Aug 7 15:07:45 2024 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Aug 7 19:21:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34b0909
sys-boot/elilo: add USE=secureboot
Signed-off-by: Andrew Ammerlaan gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38008
Signed-off-by: Andrew Ammerlaan gentoo.org>
sys-boot/elilo/{elilo-3.16-r5.ebuild => elilo-3.16-r6.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild
b/sys-boot/elilo/elilo-3.16-r6.ebuild
similarity index 96%
rename from sys-boot/elilo/elilo-3.16-r5.ebuild
rename to sys-boot/elilo/elilo-3.16-r6.ebuild
index 8f067bedb4c0..6d1f82ca9369 100644
--- a/sys-boot/elilo/elilo-3.16-r5.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit toolchain-funcs
+inherit secureboot toolchain-funcs
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
HOMEPAGE="https://sourceforge.net/projects/elilo/";
@@ -89,4 +89,6 @@ src_install() {
dodoc docs/* "${FILESDIR}"/elilo.conf.sample
doman debian/*.[0-9]
+
+ secureboot_auto_sign --in-place
}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 38b54bb93166986ea2968bad3934c72d17d187d9
Author: Filip Kobierski pm me>
AuthorDate: Tue Jul 30 12:22:18 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Aug 5 07:10:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b54bb9
sys-boot/elilo: remove empty IUSE
Signed-off-by: Filip Kobierski pm.me>
Signed-off-by: Joonas Niilola gentoo.org>
sys-boot/elilo/elilo-3.16-r5.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild
b/sys-boot/elilo/elilo-3.16-r5.ebuild
index f7c1659896c8..8f067bedb4c0 100644
--- a/sys-boot/elilo/elilo-3.16-r5.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
@@ -9,11 +9,11 @@ DESCRIPTION="Linux boot loader for EFI-based systems such as
IA-64"
HOMEPAGE="https://sourceforge.net/projects/elilo/";
SRC_URI="https://downloads.sourceforge.net/elilo/${P}-all.tar.gz
mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+S="${WORKDIR}/${P}-source"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
# gnu-efi contains only static libs, so there's no run-time dep on it
DEPEND=">=sys-boot/gnu-efi-3.0g
@@ -22,8 +22,6 @@ DEPEND=">=sys-boot/gnu-efi-3.0g
RDEPEND="sys-boot/efibootmgr
sys-fs/dosfstools[compat]"
-S="${WORKDIR}/${P}-source"
-
PATCHES=(
"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: b72e496529fc13862f2f5fc2b3871d93b485c0cd
Author: Sam James gentoo org>
AuthorDate: Tue Apr 19 15:27:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat May 14 00:45:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72e4965
sys-boot/elilo: [QA] inline ESYSROOT
ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7
Signed-off-by: Sam James gentoo.org>
sys-boot/elilo/elilo-3.16-r5.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild
b/sys-boot/elilo/elilo-3.16-r5.ebuild
index fed811421390..1aa5387103e1 100644
--- a/sys-boot/elilo/elilo-3.16-r5.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -62,7 +62,7 @@ src_compile() {
# "prefix" on the next line specifies where to find gcc, as, ld,
# etc. It's not the usual meaning of "prefix". By blanking it we
# allow PATH to be searched.
- local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ local libdir="${ESYSROOT}/usr/$(get_libdir)"
emake -j1 \
prefix= \
AS="$(tc-getAS)" \
@@ -71,7 +71,7 @@ src_compile() {
OBJCOPY="$(tc-getOBJCOPY)" \
HOSTARCH=${iarch} \
ARCH=${iarch} \
- EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ EFIINC="${ESYSROOT}/usr/include/efi" \
GNUEFILIB="${libdir}" \
EFILIB="${libdir}" \
EFICRT0="${libdir}" \
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 7d6df03fa2fdb9f5f2080c841c7820c96bda90c5 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Aug 4 08:55:41 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Aug 4 09:01:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6df03f sys-boot/elilo: drop slyfox@ from maintainers down to m-n Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> sys-boot/elilo/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml index 0b9c119b3c0..aed513bd520 100644 --- a/sys-boot/elilo/metadata.xml +++ b/sys-boot/elilo/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - sly...@gentoo.org - Sergei Trofimovich - + elilo
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: ea20d42dcc165f590ed1d6a5a380f8b460f37f2a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Jul 22 17:53:59 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Jul 22 17:54:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea20d42d
sys-boot/elilo: drop old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r4.ebuild | 94 -
1 file changed, 94 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.16-r4.ebuild
b/sys-boot/elilo/elilo-3.16-r4.ebuild
deleted file mode 100644
index 8a796f6bd91..000
--- a/sys-boot/elilo/elilo-3.16-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/";
-SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
- mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
- dev-util/patchutils"
-# dosfstools[compat] to enable 'dosfsck' symlink
-RDEPEND="sys-boot/efibootmgr
- sys-fs/dosfstools[compat]"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
- "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
- "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
- "${FILESDIR}"/${PN}-3.16-FLAGS.patch
- "${FILESDIR}"/${PN}-3.16-ARCH.patch
-)
-
-src_unpack() {
- unpack ${A} ./${P}-source.tar.gz
- mv debian "${S}"/ || die
-}
-
-src_prepare() {
- default
-
- case $(tc-arch) in
- ia64) iarch=ia64 ;;
- x86) iarch=ia32 ;;
- amd64) iarch=x86_64 ;;
- *) die "unknown architecture: $(tc-arch)" ;;
- esac
-
- # Now Gentooize it.
- sed -i \
- -e '1s:/bin/sh:/bin/bash:' \
- -e "s:##VERSION##:${PV}:" \
- -e 's:Debian GNU/:Gentoo :g' \
- -e 's:Debian:Gentoo:g' \
- -e 's:debian:gentoo:g' \
- -e "s:dpkg --print-architecture:echo ${iarch}:" \
- debian/elilo.sh || die
-}
-
-src_compile() {
- # "prefix" on the next line specifies where to find gcc, as, ld,
- # etc. It's not the usual meaning of "prefix". By blanking it we
- # allow PATH to be searched.
- local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
- emake -j1 \
- prefix= \
- AS="$(tc-getAS)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- HOSTARCH=${iarch} \
- ARCH=${iarch} \
- EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
- GNUEFILIB="${libdir}" \
- EFILIB="${libdir}" \
- EFICRT0="${libdir}" \
- NATIVE_CFLAGS="${CFLAGS}" \
- NATIVE_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- exeinto /usr/lib/elilo
- doexe elilo.efi
-
- newsbin debian/elilo.sh elilo
- dosbin tools/eliloalt
-
- insinto /etc
- newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
- dodoc docs/* "${FILESDIR}"/elilo.conf.sample
- doman debian/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: daba3df12cba0146aa49bc938210900af5faaa74
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jul 17 11:05:20 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jul 17 11:22:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daba3df1
sys-boot/elilo: bump up to EAPI=8
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r5.ebuild | 94 +
1 file changed, 94 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild
b/sys-boot/elilo/elilo-3.16-r5.ebuild
new file mode 100644
index 000..fed81142139
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+ "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+ "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+ "${FILESDIR}"/${PN}-3.16-FLAGS.patch
+ "${FILESDIR}"/${PN}-3.16-ARCH.patch
+)
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ default
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}" \
+ NATIVE_CFLAGS="${CFLAGS}" \
+ NATIVE_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/files/, sys-boot/elilo/
commit: 321303c29d48b84b8691ac2a70d719e2220f0929
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Feb 16 17:44:45 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Feb 16 17:45:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321303c2
sys-boot/elilo: allow ARCH override
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/770982
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r4.ebuild| 3 ++-
sys-boot/elilo/files/elilo-3.16-ARCH.patch | 12
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sys-boot/elilo/elilo-3.16-r4.ebuild
b/sys-boot/elilo/elilo-3.16-r4.ebuild
index c4cd5a90dd8..2670fdcaf7a 100644
--- a/sys-boot/elilo/elilo-3.16-r4.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
"${FILESDIR}"/${PN}-3.16-FLAGS.patch
+ "${FILESDIR}"/${PN}-3.16-ARCH.patch
)
src_unpack() {
diff --git a/sys-boot/elilo/files/elilo-3.16-ARCH.patch
b/sys-boot/elilo/files/elilo-3.16-ARCH.patch
new file mode 100644
index 000..935cf7adbe4
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-ARCH.patch
@@ -0,0 +1,12 @@
+Allow for easier override from make's commandline.
+--- a/Make.defaults
b/Make.defaults
+@@ -64,7 +64,7 @@ TOPDIR =
+ ALLSUBDIRS = ia32 ia64 x86_64 fs choosers devschemes tools
+
+ HOSTARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed
s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
+-ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed
s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
++ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed
s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
+ INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH)
-I$(EFIINC)/protocol -I$(TOPDIR)/efi110
+ CPPFLAGS = -DCONFIG_$(ARCH)
+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 4dcf86c7d0dd7ab251fca3986628c40581b03cbf
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Oct 3 09:26:44 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Oct 3 09:26:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcf86c7
sys-boot/elilo: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r3.ebuild | 90 -
1 file changed, 90 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild
b/sys-boot/elilo/elilo-3.16-r3.ebuild
deleted file mode 100644
index e9dc2ce50c7..000
--- a/sys-boot/elilo/elilo-3.16-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/";
-SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
- mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
- dev-util/patchutils"
-# dosfstools[compat] to enable 'dosfsck' symlink
-RDEPEND="sys-boot/efibootmgr
- sys-fs/dosfstools[compat]"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
- "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
- "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
-)
-
-src_unpack() {
- unpack ${A} ./${P}-source.tar.gz
- mv debian "${S}"/ || die
-}
-
-src_prepare() {
- default
-
- case $(tc-arch) in
- ia64) iarch=ia64 ;;
- x86) iarch=ia32 ;;
- amd64) iarch=x86_64 ;;
- *) die "unknown architecture: $(tc-arch)" ;;
- esac
-
- # Now Gentooize it.
- sed -i \
- -e '1s:/bin/sh:/bin/bash:' \
- -e "s:##VERSION##:${PV}:" \
- -e 's:Debian GNU/:Gentoo :g' \
- -e 's:Debian:Gentoo:g' \
- -e 's:debian:gentoo:g' \
- -e "s:dpkg --print-architecture:echo ${iarch}:" \
- debian/elilo.sh || die
-}
-
-src_compile() {
- # "prefix" on the next line specifies where to find gcc, as, ld,
- # etc. It's not the usual meaning of "prefix". By blanking it we
- # allow PATH to be searched.
- local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
- emake -j1 \
- prefix= \
- AS="$(tc-getAS)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- HOSTARCH=${iarch} \
- ARCH=${iarch} \
- EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
- GNUEFILIB="${libdir}" \
- EFILIB="${libdir}" \
- EFICRT0="${libdir}"
-}
-
-src_install() {
- exeinto /usr/lib/elilo
- doexe elilo.efi
-
- newsbin debian/elilo.sh elilo
- dosbin tools/eliloalt
-
- insinto /etc
- newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
- dodoc docs/* "${FILESDIR}"/elilo.conf.sample
- doman debian/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/, sys-boot/elilo/files/
commit: d32794f6d9f1b9aafa7b89b9162eb1b7083252b6
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Sep 27 08:31:35 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Sep 27 08:31:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32794f6
sys-boot/elilo: pass *FLAGS to eliloalt
The primary build target is a PE-EFI target.
But auxiliary binaries are native binaries.
Provide NATIVE_* variables to pass native opt flags.
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/744931
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r4.ebuild | 93 +
sys-boot/elilo/files/elilo-3.16-FLAGS.patch | 19 ++
2 files changed, 112 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16-r4.ebuild
b/sys-boot/elilo/elilo-3.16-r4.ebuild
new file mode 100644
index 000..c4cd5a90dd8
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+ "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+ "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+ "${FILESDIR}"/${PN}-3.16-FLAGS.patch
+)
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ default
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}" \
+ NATIVE_CFLAGS="${CFLAGS}" \
+ NATIVE_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-FLAGS.patch
b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch
new file mode 100644
index 000..a77e44d0b18
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch
@@ -0,0 +1,19 @@
+eliloalt is a rare native tool. Allow user to explicitly pass
+standart optimization flags via
+$ make NATIIVE_CFLAGS=${CFLAGS} NATIVE_LDFLAGS
+https://bugs.gentoo.org/744931
+--- a/tools/Makefile
b/tools/Makefile
+@@ -42,10 +42,10 @@ all: $(TARGET)
+ # redefine local rule (we build a Linux/ia64 binary here)
+ #
+ %.o: %.c
+- $(CC) $(OPTIMFLAGS) $(DEBUGFLAGS) -c $< -o $@
++ $(CC) $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(DEBUGFLAGS) -c $< -o $@
+
+ $(TARGET): %:%.o
+- $(CC) -o $@ $(OPTIMFLAGS) $(DEBUGFLAGS) $^
++ $(CC) -o $@ $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS)
$(DEBUGFLAGS) $^
+
+ clean:
+ $(RM) -f $(TARGET) $(FILES)
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: d941c3aadd985dfeefdfa711918b22b73e486312 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Sep 26 09:04:27 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Sep 26 09:04:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d941c3aa sys-boot/elilo: drop ia64@ from maintainers Ideally arch porting team should not be a package maintainer. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich gentoo.org> sys-boot/elilo/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml index e9138bcbce7..0b9c119b3c0 100644 --- a/sys-boot/elilo/metadata.xml +++ b/sys-boot/elilo/metadata.xml @@ -1,9 +1,9 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - i...@gentoo.org - Gentoo Linux IA-64 Development + + sly...@gentoo.org + Sergei Trofimovich elilo
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: a148dc783ade72fb93f1d5021a99de176ebd7502
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat May 30 09:13:09 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat May 30 09:13:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a148dc78
sys-boot/elilo: respect user's OBJCOPY
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r3.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild
b/sys-boot/elilo/elilo-3.16-r3.ebuild
index de13af20f9a..e9dc2ce50c7 100644
--- a/sys-boot/elilo/elilo-3.16-r3.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -66,6 +66,7 @@ src_compile() {
AS="$(tc-getAS)" \
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
HOSTARCH=${iarch} \
ARCH=${iarch} \
EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 73644b7339e88e548e00a7ac219e027bc85f69b7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Apr 1 20:59:11 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Apr 1 21:14:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73644b73
sys-boot/elilo: drop old
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/elilo-3.16-r2.ebuild | 88 -
1 file changed, 88 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.16-r2.ebuild
b/sys-boot/elilo/elilo-3.16-r2.ebuild
deleted file mode 100644
index 6bcb00cc8b7..000
--- a/sys-boot/elilo/elilo-3.16-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/";
-SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
- mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
- dev-util/patchutils"
-# dosfstools[compat] to enable 'dosfsck' symlink
-RDEPEND="sys-boot/efibootmgr
- sys-fs/dosfstools[compat]"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
- "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
-)
-
-src_unpack() {
- unpack ${A} ./${P}-source.tar.gz
- mv debian "${S}"/ || die
-}
-
-src_prepare() {
- default
-
- case $(tc-arch) in
- ia64) iarch=ia64 ;;
- x86) iarch=ia32 ;;
- amd64) iarch=x86_64 ;;
- *) die "unknown architecture: $(tc-arch)" ;;
- esac
-
- # Now Gentooize it.
- sed -i \
- -e '1s:/bin/sh:/bin/bash:' \
- -e "s:##VERSION##:${PV}:" \
- -e 's:Debian GNU/:Gentoo :g' \
- -e 's:Debian:Gentoo:g' \
- -e 's:debian:gentoo:g' \
- -e "s:dpkg --print-architecture:echo ${iarch}:" \
- debian/elilo.sh || die
-}
-
-src_compile() {
- # "prefix" on the next line specifies where to find gcc, as, ld,
- # etc. It's not the usual meaning of "prefix". By blanking it we
- # allow PATH to be searched.
- local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
- emake -j1 \
- prefix= \
- AS="$(tc-getAS)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- HOSTARCH=${iarch} \
- ARCH=${iarch} \
- EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
- GNUEFILIB="${libdir}" \
- EFILIB="${libdir}" \
- EFICRT0="${libdir}"
-}
-
-src_install() {
- exeinto /usr/lib/elilo
- doexe elilo.efi
-
- newsbin debian/elilo.sh elilo
- dosbin tools/eliloalt
-
- insinto /etc
- newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
- dodoc docs/* "${FILESDIR}"/elilo.conf.sample
- doman debian/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/files/
commit: 640116a01cbe388676ce5d70f97f06d492e0ebdb Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Dec 6 11:07:58 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Dec 6 15:38:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640116a0 sys-boot/elilo: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13893 Signed-off-by: Aaron Bauman gentoo.org> sys-boot/elilo/files/elilo.sh-chkspace.patch | 15 -- sys-boot/elilo/files/elilo.sh-vmm.patch | 43 2 files changed, 58 deletions(-) diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch deleted file mode 100644 index 710780e8da6..000 --- a/sys-boot/elilo/files/elilo.sh-chkspace.patch +++ /dev/null @@ -1,15 +0,0 @@ -Don't count duplicate files twice when summing bytesneeded - elilo/debian/elilo.sh.chkspace 2006-03-16 07:53:00.0 -0500 -+++ elilo/debian/elilo.sh 2006-03-16 07:53:27.0 -0500 -@@ -580,7 +580,9 @@ - sed 's/.*=[[:space:]]*//' | grep -v ':'` - vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ - sed 's/.*=[[:space:]]*//' | grep -v ':'` --bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c` -+allfiles=`for f in $imagefiles $initrdfiles $install $bootconf; do \ -+ echo $f; done | sort -u` -+bytesneeded=`cat $allfiles 2>/dev/null | wc -c` - # convert to KB, allowing 5% overhead - kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 )) - kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p") diff --git a/sys-boot/elilo/files/elilo.sh-vmm.patch b/sys-boot/elilo/files/elilo.sh-vmm.patch deleted file mode 100644 index 294eb03b222..000 --- a/sys-boot/elilo/files/elilo.sh-vmm.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch from Alex Williamson in -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185 support of vmm= in the -elilo script - elilo/debian/elilo.sh.novmm2006-03-16 07:49:19.0 -0500 -+++ elilo/debian/elilo.sh 2006-03-16 07:48:47.0 -0500 -@@ -364,6 +364,8 @@ - sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'` - initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \ - sed 's/.*=[[:space:]]*//' | grep -v ':'` -+vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ -+ sed 's/.*=[[:space:]]*//' | grep -v ':'` - - ## Point of no return, removing the old EFI/debian tree - rm -rf $TARGET/$EFIROOT -@@ -398,6 +400,7 @@ - -e "s|\t| |g" \ - -e "s|\(^image[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ - -e "s|\(^[[:space:]]*initrd[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ -+ -e "s|\(^[[:space:]]*vmm[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \ - < "$bootconf" > "$TARGET/$EFIROOT/$CFFILE" - if [ $? != 0 ] ; then - echo 1>&2 "$PRG: An error occured while writing to $boot" -@@ -406,7 +409,7 @@ - - [ "$DEBUG" = 1 ] && echo "" && cat "$TARGET/$EFIROOT/$CFFILE" && echo "" - --for i in $imagefiles $initrdfiles; do -+for i in $imagefiles $initrdfiles $vmmfiles; do - [ "$VERBOSE" = 1 ] && echo "$PRG: Installing $i on $boot..." - if [ -f $i ]; then - mkdir -p `dirname "$TARGET/$EFIROOT/$i"` -@@ -575,7 +578,9 @@ - sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'` - initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \ - sed 's/.*=[[:space:]]*//' | grep -v ':'` --bytesneeded=`cat $imagefiles $initrdfiles $install $bootconf 2>/dev/null | wc -c` -+vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \ -+ sed 's/.*=[[:space:]]*//' | grep -v ':'` -+bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c` - # convert to KB, allowing 5% overhead - kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 )) - kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 2936cd17dc355660656669dded43ee8c5ff12838
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Sep 28 12:30:45 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Sep 28 12:30:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2936cd17
sys-boot/elilo: drop old
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/elilo/Manifest | 6 ---
sys-boot/elilo/elilo-3.10.ebuild | 72 -
sys-boot/elilo/elilo-3.12.ebuild | 72 -
sys-boot/elilo/elilo-3.16-r1.ebuild | 87 --
sys-boot/elilo/elilo-3.16.ebuild | 85 -
sys-boot/elilo/elilo-3.6_p20060314.ebuild | 88 ---
6 files changed, 410 deletions(-)
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 5d0dfd43a4c..41b5e2e78a3 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,8 +1,2 @@
-DIST elilo-3.10.tar.gz 210896 BLAKE2B
843b9b1c3c3ad44406225245663c4ad3febfeb5e890940e25f4a397072cc8e357d1ab57717669095ed3bc296ec9fe9ef7423b52121be385b649e845ec60c792d
SHA512
4ec104f2d6a36745689619976e9811b5f5cd0d25be0f613d649ca2ff379e0514ab77c03bb474b32da87d73bd687d3d9faa9f2d07859e4c208b5d5a5a50d47e24
-DIST elilo-3.12-source.tar.gz 215125 BLAKE2B
5dc3c1f48252ac8cba625ff81608e01dfd59a9572ab4e33d0785380beb759bafd38cc20412033443427a0ae0865ec66bb669c5b99b04bbc1fde8e364a19c80b2
SHA512
a9dceb1e03ec1cabcaef696e4d1b8fe8683b0feeef2171781536bc469f8bcd0b3ab9b4460b149bb1bf68c651bce8c7abec5ef4f47e78113a611594a69e91239c
DIST elilo-3.16-all.tar.gz 485844 BLAKE2B
813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534
SHA512
4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
-DIST elilo-nightly_2006-03-14.tgz 168991 BLAKE2B
a339e3c39bb3c4068606f66aeafea0be42c4cc9fa6652a06fbcd33b088cac38bc61c35de2240a2bebff2b15f4cbc7f221a90392995ff40099275702d5e6cf8c0
SHA512
8f4bab99c9e823e1755a299e04a5d89b09d74e06a986b9732b2f48bd96c389c54d5af1fb59c4e06fe55dbe80340cfcdf63a9b0c1de1a1ed5cd0a3dd2df5f5fc2
-DIST elilo_3.10-1.diff.gz 26456 BLAKE2B
a9fb76241296ce944ab5286a34cbda7e3521f5989541e5f6538423d0fda402020a96d49e927d6a600a757aa32cc656ea6f8bf496ab19db78bfa47e9381aa9b32
SHA512
87e5bea09e66c65f048fab99ca9dfc5f0e61dd48b4ee012b7139d66af92291a79b33e2577139bfa529fd3c303b247a344384614927dfc3c2cff894bb032a3bc6
-DIST elilo_3.12-1.diff.gz 28806 BLAKE2B
0b998f4ed5d5f15d661b65baaf7292b1d4f970b1327ba2fd60b1ec3464d8cb6d74d0d1f255e07bc61cd48cb1a3360cddace8804f7ee89e9035db915a6ca72b6e
SHA512
ed3394880ae0dae63a3e6b92ccb2a8251b6fa6bbfda7e45a53fa45a06a899a89b9a760dafd44425b424b0455b7d37d6e8738da2477fae42ebf67a3b038a7e944
DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B
84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e
SHA512
b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
-DIST elilo_3.6-1.diff.gz 14944 BLAKE2B
c982bce4610168408c57beaeca70f7c2be130a75e29b662f5d21ab22097374cc2c8152f24a6eef73039fd6eb365d66c3d4d63f52fe021bb5b126f1932efdaec3
SHA512
962672f516de48f88bd453248d6469a4962fb7551214de9f73125deb64121ab08d123746b2cf8c1c202177f7272aad4cb63e6970f1860c772930bae580817bee
diff --git a/sys-boot/elilo/elilo-3.10.ebuild b/sys-boot/elilo/elilo-3.10.ebuild
deleted file mode 100644
index 9ce45ff9f51..000
--- a/sys-boot/elilo/elilo-3.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/";
-SRC_URI="mirror://sourceforge/elilo/${P}.tar.gz"
-SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.10-1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
- sys-devel/patch
- dev-util/patchutils"
-RDEPEND="sys-boot/efibootmgr
- sys-fs/dosfstools"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- ebegin Applying ../*.diff
- # Using epatch on this is annoying because it wants to create the
elilo-3.6/
- # directory. Since all the files are new, it doesn't know better.
- filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
- eend $? || return
-
- # Now Gentooize it
- sed -i "
- 1s:/bin/sh:/bin/bash:;
- s/##VERSION##/$PV/;
- s/Debian GNU\//Gentoo /g;
- s/Debian/Gentoo/g;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/, sys-boot/elilo/files/
commit: e8e25b692b8ae413127a7766ae5c66461b33a864
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Oct 1 22:34:49 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Oct 1 22:35:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e25b69
sys-boot/elilo: fix build failure against gnu-efi-3.0.8
Build failed as:
> ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy'
> extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
> ^~~
Work it around by renaming local 'StrnCpy' definition to 'elilo_StrnCpy'.
Reported-by: Bill Glessner
Signed-off-by: Sergei Trofimovich gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sys-boot/elilo/elilo-3.16-r3.ebuild| 89 ++
.../elilo/files/elilo-3.16-strncpy-clash.patch | 23 ++
2 files changed, 112 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild
b/sys-boot/elilo/elilo-3.16-r3.ebuild
new file mode 100644
index 000..de13af20f9a
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+ "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+ "${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+)
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ default
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
new file mode 100644
index 000..fb2f6878be0
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch
@@ -0,0 +1,23 @@
+gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition:
+ ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy'
+ extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+ ^~~
+
+Work it around by always using private copy.
+
+Reported-by: Bill Glessner
+--- a/strops.h
b/strops.h
+@@ -29,3 +29,4 @@
+ extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c);
++#define StrnCpy elilo_StrnCpy
+ extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count);
+ extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count);
+--- a/strops.c
b/strops.c
+@@ -27,4 +27,6 @@
+ #include
+
++#include "strops.h"
++
+ //#define CHAR_NULL(CHAR16)'\0'
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: e4408fdd30e54ec17b4be7596d27a8afe9225bd1
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed May 2 06:58:49 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed May 2 06:59:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4408fdd
sys-boot/elilo: stable 3.16-r2 for ia64, bug #579278
Bug: https://bugs.gentoo.org/579278
Package-Manager: Portage-2.3.31, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"
sys-boot/elilo/elilo-3.16-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/elilo/elilo-3.16-r2.ebuild
b/sys-boot/elilo/elilo-3.16-r2.ebuild
index 840e7f568f8..6bcb00cc8b7 100644
--- a/sys-boot/elilo/elilo-3.16-r2.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ia64 ~x86"
IUSE=""
# gnu-efi contains only static libs, so there's no run-time dep on it
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/files/, sys-boot/elilo/
commit: b1cc70ce5c810fb85684ea8f681465a20546c0c8
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Apr 21 19:09:51 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Apr 21 19:10:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cc70ce
sys-boot/elilo: fix build failure on ia64 against gnu-efi-3.0.6
Disambiguate setpjmp()/longjmp()/jmp_buf implementation across
elilo copy and gnu-efi-3.0.6.
To avoid behaviour change I'm keeping elilo's implementation for now
as the jmp_buf passing ABI is slightly different across the two.
```
setjmp.h:25:14: error: conflicting types for 'jmp_buf'
typedef long jmp_buf[_JBLEN] __attribute__ ((aligned (16)));
^~~
In file included from /usr/include/efi/efisetjmp.h:5:0,
from /usr/include/efi/efi.h:60,
from gzip.c:29:
/usr/include/efi/ia64/efisetjmp_arch.h:45:23: note: previous
declaration of 'jmp_buf' was here
} ALIGN(JMPBUF_ALIGN) jmp_buf;
^~~
```
Reported-by: Stanton Arch
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sys-boot/elilo/elilo-3.16-r2.ebuild| 88
.../files/elilo-3.16-gnu-efi-3.0.6-ia64.patch | 112 +
2 files changed, 200 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16-r2.ebuild
b/sys-boot/elilo/elilo-3.16-r2.ebuild
new file mode 100644
index 000..840e7f568f8
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+ "${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+)
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ default
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-gnu-efi-3.0.6-ia64.patch
b/sys-boot/elilo/files/elilo-3.16-gnu-efi-3.0.6-ia64.patch
new file mode 100644
index 000..21f10f31644
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-gnu-efi-3.0.6-ia64.patch
@@ -0,0 +1,112 @@
+Disambiguate setpjmp()/longjmp()/jmp_buf across elilo copy and gnu-efi-3.0.6.
+
+In order not to chang the behaviour I'm keeping elilo's implementation
+as the jmp_buf passing ABI is slightly different scross the two.
+
+ setjmp.h:25:14: error: conflicting types for 'jmp_buf'
+ typedef long jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees
128-bit alignment! */
+^~~
+ In file included from /usr/include/efi/efisetjmp.h:5:0,
+ from /usr/include/efi/efi.h:60,
+ from gzip.c:29:
+ /usr/include/efi/ia64/efisetjmp_arch.h:45:23: note: previous decl
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 265d793f0f06ba108989aa0165b9c5fc51bf7e9a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Jan 29 20:12:54 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Jan 29 20:13:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265d793f
sys-boot/elilo: add sys-fs/dosfstools[compat] depend
elilo script uses dosfsck before refreshing EFI partition.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
sys-boot/elilo/elilo-3.16-r1.ebuild | 87 +
1 file changed, 87 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16-r1.ebuild
b/sys-boot/elilo/elilo-3.16-r1.ebuild
new file mode 100644
index 000..96b2860daf6
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+)
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ default
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 5be52b47fbece23a9a7d44763ae64e722f955725
Author: charIes17 arcor de>
AuthorDate: Sat Aug 5 17:08:58 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Aug 6 10:49:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be52b47
sys-boot/elilo: https for HOMEPAGE
Closes: https://github.com/gentoo/gentoo/pull/5308
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sys-boot/elilo/elilo-3.10.ebuild | 4 ++--
sys-boot/elilo/elilo-3.12.ebuild | 4 ++--
sys-boot/elilo/elilo-3.16.ebuild | 4 ++--
sys-boot/elilo/elilo-3.6_p20060314.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-boot/elilo/elilo-3.10.ebuild b/sys-boot/elilo/elilo-3.10.ebuild
index cf346ab368a..7ce19bd2004 100644
--- a/sys-boot/elilo/elilo-3.10.ebuild
+++ b/sys-boot/elilo/elilo-3.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit toolchain-funcs eutils
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="http://elilo.sourceforge.net/";
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
SRC_URI="mirror://sourceforge/elilo/${P}.tar.gz"
SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.10-1.diff.gz"
diff --git a/sys-boot/elilo/elilo-3.12.ebuild b/sys-boot/elilo/elilo-3.12.ebuild
index a65ac13d581..47665b54ee2 100644
--- a/sys-boot/elilo/elilo-3.12.ebuild
+++ b/sys-boot/elilo/elilo-3.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit toolchain-funcs eutils
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="http://elilo.sourceforge.net/";
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
SRC_URI="mirror://sourceforge/elilo/${P}-source.tar.gz"
SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.12-1.diff.gz"
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
index 893dec3d591..7f215a84141 100644
--- a/sys-boot/elilo/elilo-3.16.ebuild
+++ b/sys-boot/elilo/elilo-3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
inherit toolchain-funcs eutils multilib
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="http://elilo.sourceforge.net/";
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
diff --git a/sys-boot/elilo/elilo-3.6_p20060314.ebuild
b/sys-boot/elilo/elilo-3.6_p20060314.ebuild
index 80a1792829c..c17dc805837 100644
--- a/sys-boot/elilo/elilo-3.6_p20060314.ebuild
+++ b/sys-boot/elilo/elilo-3.6_p20060314.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit toolchain-funcs eutils
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="http://elilo.sourceforge.net/";
+HOMEPAGE="https://sourceforge.net/projects/elilo/";
if [[ $PV == *_p* ]] ; then
MY_P=${PV#*_p}
MY_P=${PN}-nightly_${MY_P:0:4}-${MY_P:4:2}-${MY_P:6:2}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/
commit: 4d0a70d5e742cfa772dc23f4f8dedea5bdb79123
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Dec 28 19:06:55 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Dec 28 19:06:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0a70d5
sys-boot/elilo: version bump to 3.16 #504334
sys-boot/elilo/Manifest | 2 +
sys-boot/elilo/elilo-3.16.ebuild | 84
2 files changed, 86 insertions(+)
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 941cf8b..5566c88 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,6 +1,8 @@
DIST elilo-3.10.tar.gz 210896 SHA256
65d0d7cc31bd0ef6824b9394dbf8991eb850aa4ba2dde1f9302e3da3cb2a4399 SHA512
4ec104f2d6a36745689619976e9811b5f5cd0d25be0f613d649ca2ff379e0514ab77c03bb474b32da87d73bd687d3d9faa9f2d07859e4c208b5d5a5a50d47e24
WHIRLPOOL
f2d70ab94f1b82aac9ad8409557f2b0fb5d25f124e546f1e457e20a4da2b68baf1749377fb7a45b3bb6203bf9c54309adf9b9e072d7871e9d1a6b1d17b3c2fdb
DIST elilo-3.12-source.tar.gz 215125 SHA256
5005534ae972603c65caa8debb2bf3c4a22b895588323bc1b0a7a9f114e030ee SHA512
a9dceb1e03ec1cabcaef696e4d1b8fe8683b0feeef2171781536bc469f8bcd0b3ab9b4460b149bb1bf68c651bce8c7abec5ef4f47e78113a611594a69e91239c
WHIRLPOOL
9e874b4512721c75b12f9c635e7bbdf63b0d0427bbcf880c38d9c53b54c53c15cf15a9ddfae788d7068a9d8ae615d1492f2af4f9046d6c7c48e3507ba13bbb7e
+DIST elilo-3.16-all.tar.gz 485844 SHA256
69e361d95c01ea2657200b2215464fc0235b01d3e317d2f2276284259b06d392 SHA512
4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
WHIRLPOOL
5cf749f7120cc1789afc856dc8e0ad7fd4a34885caac7ab96da838ea35eec2d09356d602e0e8a9f28ce5fd021f977d4d17b7c16e03c8e54dcfe658f5c9b42c4e
DIST elilo-nightly_2006-03-14.tgz 168991 SHA256
b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c SHA512
8f4bab99c9e823e1755a299e04a5d89b09d74e06a986b9732b2f48bd96c389c54d5af1fb59c4e06fe55dbe80340cfcdf63a9b0c1de1a1ed5cd0a3dd2df5f5fc2
WHIRLPOOL
d389ae56432d45ed96d156fb982f9f961e774ca41e6c8dc8cc3a1cc4290436b944b945a14954e9ca7eff4de67dd7fa9bd53960d8c92edc2e9de8c87bf47f3967
DIST elilo_3.10-1.diff.gz 26456 SHA256
de81eb071d4c7a3f02c629911cfd95f0fdc8705575df7a596e5630788bbb3643 SHA512
87e5bea09e66c65f048fab99ca9dfc5f0e61dd48b4ee012b7139d66af92291a79b33e2577139bfa529fd3c303b247a344384614927dfc3c2cff894bb032a3bc6
WHIRLPOOL
d8c33bd0b5310206c89bf9b8d02443b9414adb2754651a412ff05a0727ae70e7d97a5d26817295dea0b37d71662f016ec58d95f0d33d6dba828d61e962dabcaf
DIST elilo_3.12-1.diff.gz 28806 SHA256
26532bdf9a8c3455d12f22c59d1d5d9656dcb432dabd1a80cdbcd010e93305b5 SHA512
ed3394880ae0dae63a3e6b92ccb2a8251b6fa6bbfda7e45a53fa45a06a899a89b9a760dafd44425b424b0455b7d37d6e8738da2477fae42ebf67a3b038a7e944
WHIRLPOOL
0167eb79a8fdb9d6f0417abd75c1f325ddab2f451126955a7542045f42febd6188c03e3f7dd5a0020c67bba489dbb8afb4585687a53d2c026f03a49104c0c032
+DIST elilo_3.14-3.debian.tar.gz 32179 SHA256
30d4e5eabfcdea8bc6c3ae3af05cff9e182847d388a83016c85a1f3fbb42296f SHA512
b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
WHIRLPOOL
c5ffda521ee6e4253bc45160e712371d2a561841198152289d84971430a17a973e93382cec460efa9f7a09053b910748352ce97dde7e45d2ea737b14ddc5078e
DIST elilo_3.6-1.diff.gz 14944 SHA256
cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073 SHA512
962672f516de48f88bd453248d6469a4962fb7551214de9f73125deb64121ab08d123746b2cf8c1c202177f7272aad4cb63e6970f1860c772930bae580817bee
WHIRLPOOL
23f1c3b6fd8cfb7356cc165765b724ab10278b35ad36427c018b2931a9723e887f2cbecaa21bd3cd13fa5784035683e40a8cfc6df4cf65acaeb3fac1d6488dc9
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
new file mode 100644
index 000..cefd571
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="http://elilo.sourceforge.net/";
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools"
+
+S="${WORKDIR}/${P}-source"
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ # The patches Debian had were merged upstream.
+ #epatch debian/patches/*.diff
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "
[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/, sys-boot/elilo/files/
commit: b6344f771c7953a9cda0765ea27e701c117f2cd1
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Dec 28 19:07:27 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Dec 28 19:07:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6344f77
sys-boot/elilo: fix elilo script error #299665
sys-boot/elilo/elilo-3.16.ebuild | 2 ++
sys-boot/elilo/files/elilo-3.16-elilo-loop.patch | 15 +++
2 files changed, 17 insertions(+)
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
index cefd571..472488d 100644
--- a/sys-boot/elilo/elilo-3.16.ebuild
+++ b/sys-boot/elilo/elilo-3.16.ebuild
@@ -30,6 +30,8 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+
# The patches Debian had were merged upstream.
#epatch debian/patches/*.diff
diff --git a/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
new file mode 100644
index 000..b574c29
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/299665
+
+patch by Dennis Schridde
+
+--- a/debian/elilo.sh
b/debian/elilo.sh
+@@ -321,6 +321,8 @@
+
+ mnt()
+ {
++local loop
++
+ ## we can even create bootstrap filesystem images directly if you
+ ## ever wanted too.
+ if [ -f "$boot" ] ; then
