commit: 873a26156c33c3a7f54b0675092c0f8ee1b00258
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 20:05:47 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=873a2615
sys-boot/yaboot: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-boot/yaboot/Manifest | 2 -
sys-boot/yaboot/files/sysfs-ofpath.patch | 105 ------------------
sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch | 41 --------
sys-boot/yaboot/yaboot-1.3.14-r2.ebuild | 47 ---------
sys-boot/yaboot/yaboot-1.3.16.ebuild | 56 ----------
sys-boot/yaboot/yaboot-1.3.17-r2.ebuild | 59 -----------
sys-boot/yaboot/yaboot-1.3.17-r3.ebuild | 117 ---------------------
7 files changed, 427 deletions(-)
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 65faee10607..70d55ac518f 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,4 +1,2 @@
DIST e2fsprogs-1.42.13.tar.gz 6511931 BLAKE2B
2f849e82ad366f86d9d166f1901a99a8ac0ddc94471a29fb0de9132ae2ba8f8dc0f4c143acf889afdaa1daf1c57e7bf545a2b4e15ebb8463667f2768a8bc2ebb
SHA512
d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0
-DIST yaboot-1.3.14.tar.gz 219089 BLAKE2B
e9f71476502dd61e1e277980eab486b35675f809249e27d72627f6469c75c7ea43740898cc8dc58196bb70d08dce52ef334fcd035ac92c66a4f77236a0371049
SHA512
7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
-DIST yaboot-1.3.16.tar.gz 220360 BLAKE2B
e717b101f14b6178f9fdcd4cf45077c1b9c5db91504f8a000710c02d8b35f6094deb590710c09352fcd18385122a1824b99de5600b176c79da0937fa5b287b0b
SHA512
9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
DIST yaboot-1.3.17.tar.gz 224325 BLAKE2B
41f96266f2342eebbfdc3c0eb64eeaf59e55a31d7388f86839cf9318d231ef808d3aa16fb3b3fdfe85a6fca743e191d064f0ed633723f135a7ca25483e460566
SHA512
da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de
diff --git a/sys-boot/yaboot/files/sysfs-ofpath.patch
b/sys-boot/yaboot/files/sysfs-ofpath.patch
deleted file mode 100644
index 7ebc0bfac86..00000000000
--- a/sys-boot/yaboot/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- ybin/ofpath 2008-08-03 04:00:35.000000000 -0400
-+++ ybin/ofpath 2009-01-09 13:46:12.000000000 -0500
-@@ -337,15 +337,18 @@
-
- ide_ofpath()
- {
-- if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-+ if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then
- echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
- return 1
- fi
-
-- local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-- if [ -z "$IDEBUS" ] ; then
-- echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
-- return 1
-+ if [ -L "/proc/ide/$DEVNODE" ] ; then
-+ local USE_OLD_PROC=1
-+ local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-+ if [ -z "$IDEBUS" ] ; then
-+ echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
-+ return 1
-+ fi
- fi
-
- case "$(uname -r)" in
-@@ -363,7 +366,8 @@
- echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
- return 1
- fi
-- local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
-+ local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd)
-+ OF1275IDE="${OF1275IDE}/../../devspec"
- ;;
- *)
- local OF1275IDE="/proc/ide/$IDEBUS/devspec"
-@@ -402,34 +406,41 @@
- return 1
- fi
-
-- if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
-- echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not
exist"
-- return 1
-- fi
--
-- case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-- ide|ata)
-- local MASTER="/disk@0"
-- local SLAVE="/disk@1"
-- ;;
-- pci-ide|pci-ata)
-- local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
-- local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
-- ;;
-- scsi) ## some lame controllers pretend they are scsi, hopefully all
kludges are created equal.
-- local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
-- local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
-- ;;
-- spi)
-- local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
-- local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
-- ;;
-- *)
-- echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat
/proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
-- return 1
-- ;;
-- esac
-+
-+ if [ "${USE_OLD_PROC}" = "1" ] ; then
-+ if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
-+ echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel
does not exist"
-+ return 1
-+ fi
-
-+ case "$(cat /proc/device-tree${DEVSPEC}/device_type 2>
/dev/null)" in
-+ ide|ata)
-+ local MASTER="/disk@0"
-+ local SLAVE="/disk@1"
-+ ;;
-+ pci-ide|pci-ata)
-+ local MASTER="/@$(cat
/proc/ide/${IDEBUS}/channel)/disk@0"
-+ local SLAVE="/@$(cat
/proc/ide/${IDEBUS}/channel)/disk@1"
-+ ;;
-+ scsi) ## some lame controllers pretend they are scsi,
hopefully all kludges are created equal.
-+ local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) *
2 + 0))"
-+ local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) *
2 + 1))"
-+ ;;
-+ spi)
-+ local MASTER="/disk@$(cat
/proc/ide/${IDEBUS}/channel),0"
-+ local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
-+ ;;
-+ *)
-+ echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat
/proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
-+ return 1
-+ ;;
-+ esac
-+ else
-+ ### I don't know what other disks would look like... FIXME
-+ local MASTER="/disk@0"
-+ local SLAVE="/disk@1"
-+ fi
-+
- case "$DEVNODE" in
- hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
- echo "${DEVSPEC}${MASTER}:$PARTITION"
diff --git a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
deleted file mode 100644
index 0fe4e250f29..00000000000
--- a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uNr yaboot/lib/malloc.c yaboot-1.3.16//lib/malloc.c
---- yaboot/lib/malloc.c 2010-07-09 03:18:17.000000000 +0100
-+++ yaboot-1.3.16//lib/malloc.c 2011-01-23 16:57:13.000000000 +0000
-@@ -42,6 +42,37 @@
- last_alloc = 0;
- }
-
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+ return (char *)((((unsigned long)ptr) + (align - 1UL)) &
-+ ~(align - 1UL));
-+}
-+
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+ char *caddr;
-+
-+ if (alignment & (alignment - 1UL))
-+ return -1;
-+
-+ if (alignment & (sizeof(void *) - 1UL))
-+ return -1;
-+
-+ if (size == 0)
-+ {
-+ *memptr = (void *)0;
-+ return 0;
-+ }
-+
-+ caddr = align_ptr_to(malloc_ptr, alignment);
-+ malloc_ptr = (caddr + size);
-+ last_alloc = caddr;
-+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+ *memptr = caddr;
-+ return 0;
-+}
-+
- void *malloc (unsigned int size)
- {
- char *caddr;
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
deleted file mode 100644
index dae3363bec7..00000000000
--- a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org";
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
- sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
- !ibm? (
- sys-fs/hfsutils
- sys-fs/hfsplusutils
- sys-fs/mac-fdisk
- )"
-
-src_prepare() {
- # No need to hardcode this path -- the compiler already knows to use it.
- sed -i \
- -e 's:-I/usr/include::' \
- Makefile || die
-
- # dual boot patch
- epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
- epatch "${FILESDIR}/chrpfix.patch"
- epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
- epatch "${FILESDIR}/sysfs-ofpath.patch"
-}
-
-src_compile() {
- unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- sed -i -e 's/\/local//' etc/yaboot.conf
- emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild
b/sys-boot/yaboot/yaboot-1.3.16.ebuild
deleted file mode 100644
index d7c35c1ef85..00000000000
--- a/sys-boot/yaboot/yaboot-1.3.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org";
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
- sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
- !ibm? (
- sys-fs/hfsutils
- sys-fs/hfsplusutils
- sys-fs/mac-fdisk
- )"
-
-src_unpack() {
- default
- cd "${S}"
- cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
- # No need to hardcode this path -- the compiler already knows to use it.
- sed -i \
- -e 's:-I/usr/include::' \
- Makefile || die
-
- # dual boot patch
- epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
- epatch "${FILESDIR}/chrpfix.patch"
- epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-
- # e2fsprogs memalign patch
- epatch "${FILESDIR}/${P}-memalign.patch"
-}
-
-src_compile() {
- unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- sed -i -e 's/\/local//' etc/yaboot.conf || die
- emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
- mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
deleted file mode 100644
index 388d67bca95..00000000000
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org";
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
- sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
- !ibm? (
- sys-fs/hfsutils
- sys-fs/hfsplusutils
- sys-fs/mac-fdisk
- )"
-
-src_unpack() {
- default
- cd "${S}"
- cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
- # 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
-
- # dual boot patch
- epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
- epatch "${FILESDIR}/chrpfix.patch"
- epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
- epatch "${FILESDIR}/${PN}-stubfuncs.patch"
-
- # Fix the devspec path on newer kernels
- epatch "${FILESDIR}/new-ofpath-devspec.patch"
-}
-
-src_compile() {
- unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- sed -i -e 's/\/local//' etc/yaboot.conf || die
- emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
- mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
deleted file mode 100644
index 832df154e07..00000000000
--- a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 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="
- sys-apps/powerpc-utils
-"
-RDEPEND="!sys-boot/yaboot-static
- !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
-}
