[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/

[Michał Górny]

commit:     9d3d9bc8d7bba1ee3e3e6839066287d0d857f0f3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 05:18:20 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May  8 05:19:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3d9bc8

sys-boot/yaboot: Fix duplicate maintainer entry

 sys-boot/yaboot/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys-boot/yaboot/metadata.xml b/sys-boot/yaboot/metadata.xml
index 6e06d45..5eb0519 100644
--- a/sys-boot/yaboot/metadata.xml
+++ b/sys-boot/yaboot/metadata.xml
@@ -5,8 +5,4 @@
 	<email>ppc@gentoo.org</email>
 	<name>Gentoo Linux PowerPC Development</name>
 </maintainer>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/

[Sergei Trofimovich]

commit:     e29c82c3979e80305a116fe89eb1220e096224c7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 08:50:54 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 26 08:50:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29c82c3

sys-boot/yaboot: disable ld.gold, bug #678710

Reported-by: xela
Closes: https://bugs.gentoo.org/678710
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-boot/yaboot/yaboot-1.3.17-r3.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
index b127a5072d3..832df154e07 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
@@ -66,6 +66,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# ld.gold fails to link yaboot as:
+	#  sorry, I can't find space in second/yaboot.chrp to put the note
+	# bug #678710
+	tc-ld-disable-gold
+
 	pushd "${WORKDIR}/${E2FS_P}" || die
 	econf \
 		--enable-libblkid \

[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/

[Matt Turner]

commit:     c0215666980a5559d42354b4a552fec41430bbd6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 20:14:34 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 20:22:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0215666

sys-boot/yaboot: Stabilize 1.3.17-r4 ppc

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-boot/yaboot/yaboot-1.3.17-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
index 28bd397e2aa..91ba5ea6797 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc -ppc64"
+KEYWORDS="-* ppc -ppc64"
 IUSE="ibm"
 
 DEPEND=""

[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/

[Matt Turner]

commit:     e59f4f8b190152fe9ab5bbfdcc24ffe48838a3ae
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 20:03:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 20:22:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59f4f8b

sys-boot/yaboot: Depend on sys-apps/ibm-powerpc-utils

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-boot/yaboot/yaboot-1.3.17-r4.ebuild | 117 ++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
new file mode 100644
index 00000000000..28bd397e2aa
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+# yaboot is sensitive to external libc dependencies
+# of e2fsprogs. Pin to known working versions.
+# As a bonus we can control CFLAGS used to build e2fsprogs.
+# See compile_bundled_e2fsprogs() below and https://bugs.gentoo.org/641560
+E2FS_P="e2fsprogs-1.42.13"
+
+DESCRIPTION="PPC Bootloader"
+HOMEPAGE="http://yaboot.ozlabs.org"
+SRC_URI="
+	http://yaboot.ozlabs.org/releases/${P}.tar.gz
+	mirror://sourceforge/e2fsprogs/${E2FS_P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc -ppc64"
+IUSE="ibm"
+
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot-static
+	sys-apps/ibm-powerpc-utils
+	!ibm? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils
+		sys-fs/mac-fdisk
+	)"
+
+PATCHES=(
+	# dual boot patch
+	"${FILESDIR}/yabootconfig-1.3.13.patch"
+	"${FILESDIR}/chrpfix.patch"
+	"${FILESDIR}/${P}-nopiessp-gcc4.patch"
+	"${FILESDIR}/${PN}-stubfuncs.patch"
+
+	# Fix the devspec path on newer kernels
+	"${FILESDIR}/new-ofpath-devspec.patch"
+)
+
+src_prepare() {
+	# has to be copied before 'new-ofpath-devspec'
+	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath" || die
+	default
+
+	pushd "${WORKDIR}/${E2FS_P}"
+	eapply "${FILESDIR}"/e2fsprogs-1.42.13-sysmacros.h.patch
+	popd
+
+	# No need to hardcode this path -- the compiler already knows to use it.
+	# Error only on real errors, for prom printing format compile failure.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		-e 's:-Werror:-Wno-error:g' \
+		Makefile || die
+
+	# We'll install bundled libext2fs.a here
+	DEPS_DIR="${T}"/bundled-deps
+	export DEPS_DIR
+}
+
+src_configure() {
+	# ld.gold fails to link yaboot as:
+	#  sorry, I can't find space in second/yaboot.chrp to put the note
+	# bug #678710
+	tc-ld-disable-gold
+
+	pushd "${WORKDIR}/${E2FS_P}" || die
+	econf \
+		--enable-libblkid \
+		--enable-libuuid \
+		--disable-fsck \
+		--disable-quota
+	popd
+
+	default
+}
+
+src_compile() {
+	# Note: we use unmodified host's CFLAGS to build depends.
+	emake -C "${WORKDIR}/${E2FS_P}" V=1
+	# install-libs to install libext2fs.a for yaboot to statically link against
+	emake -C "${WORKDIR}/${E2FS_P}" DESTDIR="${DEPS_DIR}" install-libs V=1
+
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	# -std=gnu90 is needed to preserve 'inline' semantics
+	# of pre-c99 (always-inline) to avoid duplicate symbol
+	# definition, bug #641560.
+	# -L${deps_prefix}/usr/lib is needed to inject known
+	# working libext2fs.a as yaboot bundles header overrides
+	# that assume matcking implementation. System's version
+	# frequently does not work like in bug #641560.
+	emake \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib"
+}
+
+src_install() {
+	sed -i -e 's/\/local//' etc/yaboot.conf || die
+	emake \
+		ROOT="${D}" \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib" \
+		\
+		install
+	mv "${ED}"/etc/yaboot.conf{,.sample} || die
+}