[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/files/
commit: d72d224bc91e1011773e6b10023663ed11637f63
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Nov 18 18:37:18 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Nov 19 07:27:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72d224b
sys-boot/yaboot: remove unused patch
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18316
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch | 38
1 file changed, 38 deletions(-)
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
deleted file mode 100644
index ed1755b72b3..000
--- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-disable ssp usage in yaboot itself
-
-unfortunately, since we link against external libs that themselves were built
-with ssp turned on, we have to provide stubs to keep the linking from failing
-
yaboot-1.3.13/Config.gentoo
-+++ yaboot-1.3.13/Config.gentoo
-@@ -0,0 +1,6 @@
-+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null
2>&1; \
-+ then echo "$(1)"; else echo "$(2)"; fi)
-+
-+CFLAGS += $(call check_gcc, -fno-stack-protector)
-+CFLAGS += $(call check_gcc, --nopie)
-+
yaboot-1.3.13/Makefile
-+++ yaboot-1.3.13/Makefile
-@@ -1,6 +1,7 @@
- ## Setup
-
- include Config
-+include Config.gentoo
-
- VERSION = 1.3.13
- # Debug mode (spam/verbose)
-@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o
second/file.o \
- second/partition.o second/fs.o second/cfg.o second/setjmp.o
second/cmdline.o \
- second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
-- lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o
lib/malloc.o lib/strstr.o
-+ lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o
lib/malloc.o lib/strstr.o lib/ssp.o
-
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
yaboot-1.3.14/lib/ssp.c
-+++ yaboot-1.3.14/lib/ssp.c
-@@ -0,0 +1,2 @@
-+void __stack_chk_fail(void) {}
-+void __stack_chk_fail_local(void) {}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot-static/, sys-boot/yaboot-static/files/
commit: a169584e8c4aae302c73f7feeb6458cf21170432
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 21:36:17 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 21:36:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a169584e
sys-boot/yaboot-static: Fix EAPI=7 port
Signed-off-by: Matt Turner gentoo.org>
sys-boot/yaboot-static/files/new-ofpath-devspec.patch | 4 ++--
sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
index f225e8e1bb4..822173904ad 100644
--- a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
@@ -1,7 +1,7 @@
Fix the devspec path on newer kernels
usr/sbin/ofpath
-+++ usr/sbin/ofpath
+--- a/usr/sbin/ofpath
b/usr/sbin/ofpath
@@ -85,11 +85,20 @@
[ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
index b49e62ff1e9..cf88b3abb22 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
@@ -33,7 +33,8 @@ QA_PRESTRIPPED="
"
src_prepare() {
- epatch "${FILESDIR}/new-ofpath-devspec.patch"
+ default
+ eapply "${FILESDIR}/new-ofpath-devspec.patch"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/
commit: c0215666980a5559d42354b4a552fec41430bbd6 Author: Matt Turner gentoo org> AuthorDate: Wed Oct 14 20:14:34 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Oct 14 20:22:08 2020 + 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 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/
commit: e59f4f8b190152fe9ab5bbfdcc24ffe48838a3ae
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 20:03:36 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 20:22:07 2020 +
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 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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/, sys-boot/yaboot/files/
commit: 873a26156c33c3a7f54b0675092c0f8ee1b00258
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 20:05:47 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 20:22:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873a2615
sys-boot/yaboot: Drop old versions
Signed-off-by: Matt Turner 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..000
--- a/sys-boot/yaboot/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
ybin/ofpath2008-08-03 04:00:35.0 -0400
-+++ ybin/ofpath2009-01-09 13:46:12.0 -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:
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot-static/files/, sys-boot/yaboot-static/
commit: ddfaadddff98bf2d3a19e1dd32fef412bc2fbff4
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 20:08:47 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 20:22:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfaaddd
sys-boot/yaboot-static: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
sys-boot/yaboot-static/Manifest| 2 -
sys-boot/yaboot-static/files/sysfs-ofpath.patch| 105 -
.../yaboot-static/yaboot-static-1.3.14-r1.ebuild | 43 -
.../yaboot-static/yaboot-static-1.3.16-r1.ebuild | 37
.../yaboot-static/yaboot-static-1.3.17-r1.ebuild | 41
5 files changed, 228 deletions(-)
diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index f45d6aaae94..77a7d03ac7d 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,3 +1 @@
-DIST yaboot-static-1.3.14.tbz2 154587 BLAKE2B
258641b2c12bd7877976d7b22b23a15443327f34c7a07bb60675e040e4b9ba1a9deff56d64c391761d2fafbf830fec7172164e0786beb0cd2971179444d3dcd8
SHA512
e175fd3b31c8e26dd7177ab3c995015ebeb34f2877e1e64eabb3cbb21d0cb0e41e9c60c423e07ebb48f43ccd60ff1ff95a2001d0af220531be1bd25e04cf9bdc
-DIST yaboot-static-1.3.16.tbz2 159798 BLAKE2B
8ca04f7c2a43444898c3b057860ccc295c6aa2739fed5aff430563cdfa7395885176a0b8cd8f0e2e00effbd42bcc1f76c6502cf367594c83ffa71f8682dca120
SHA512
9aaf4432764631db923638d11d87868e9774ea6bec875110af1cd21a818c59781b7beebac4848a6a32aa592816fded214f5c6b159ecbd1654a0c6051c42dd580
DIST yaboot-static-1.3.17.tbz2 162142 BLAKE2B
ddaa1e01c08b926a0fb295e350ba8a80a0b2c5d0cc7a8346d05e7e6c7441b9748f781a82382afcaad770ed04ebd4e3032bd16e605b8ad984b13ab9564500890a
SHA512
23caf8d7308aba7402f13fc558e2182f63317fa7cf502899503247d2d2b8741b8327b447a50edce775eed0ea02fed5b675f4b40c8bafd956cbd25662c9f2ad72
diff --git a/sys-boot/yaboot-static/files/sysfs-ofpath.patch
b/sys-boot/yaboot-static/files/sysfs-ofpath.patch
deleted file mode 100644
index 7a365910049..000
--- a/sys-boot/yaboot-static/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
usr/sbin/ofpath2008-08-03 04:00:35.0 -0400
-+++ usr/sbin/ofpath2009-01-09 13:46:12.0 -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
-+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot-static/
commit: ab5d1f9ab2507f761e7c9d07db157a204f8c1973
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 20:08:17 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 20:22:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5d1f9a
sys-boot/yaboot-static: Depend on sys-apps/ibm-powerpc-utils
Signed-off-by: Matt Turner gentoo.org>
.../yaboot-static/yaboot-static-1.3.17-r2.ebuild | 41 ++
1 file changed, 41 insertions(+)
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
new file mode 100644
index 000..d5157e407db
--- /dev/null
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
+
+EAPI=7
+
+DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
+HOMEPAGE="http://yaboot.ozlabs.org/;
+SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc ppc64"
+IUSE="ibm"
+
+DEPEND=""
+RDEPEND="
+ !sys-boot/yaboot
+ sys-apps/ibm-powerpc-utils
+ !ibm? (
+ sys-fs/hfsutils
+ sys-fs/hfsplusutils
+ sys-fs/mac-fdisk
+ )"
+
+S=${WORKDIR}
+
+QA_PRESTRIPPED="
+ /usr/lib/yaboot/yaboot
+ /usr/lib/yaboot/yaboot.chrp
+ /usr/lib/yaboot/addnote
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/new-ofpath-devspec.patch"
+}
+
+src_install() {
+ cp -pPR "${WORKDIR}"/* "${D}" || die
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot-static/
commit: 80cf7b0264f5981440ad58ed59d70a9650acf892
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 14 20:15:09 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 14 20:22:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cf7b02
sys-boot/yaboot-static: Stabilize 1.3.17-r2 ppc
Signed-off-by: Matt Turner gentoo.org>
sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
index d5157e407db..b49e62ff1e9 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~ppc ppc64"
+KEYWORDS="-* ppc ppc64"
IUSE="ibm"
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/
commit: e29c82c3979e80305a116fe89eb1220e096224c7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun May 26 08:50:54 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun May 26 08:50:54 2019 +
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 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/, sys-boot/yaboot/files/
commit: 80e699db21db9352bb9d309c6c9056ffb1902c69 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Jan 16 22:13:26 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Jan 16 22:13:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e699db sys-boot/yaboot: bundle e2fsprogs-1.42.13, bug #641560 By default yaboot setup is unusual: it provides it's own ext2fs headers and links against systems' ext2fs code. That occasionally breaks when ext2fs.a gets too much out of sync with expected interface. Pin it to something that was observed to work by Olivier Néumin. Reported-by: Paul Osmialowski Bug: https://bugs.gentoo.org/641560 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> sys-boot/yaboot/Manifest | 1 + .../files/e2fsprogs-1.42.13-sysmacros.h.patch | 85 sys-boot/yaboot/yaboot-1.3.17-r3.ebuild| 112 + 3 files changed, 198 insertions(+) diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest index dac7ca649e1..65faee10607 100644 --- a/sys-boot/yaboot/Manifest +++ b/sys-boot/yaboot/Manifest @@ -1,3 +1,4 @@ +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/e2fsprogs-1.42.13-sysmacros.h.patch b/sys-boot/yaboot/files/e2fsprogs-1.42.13-sysmacros.h.patch new file mode 100644 index 000..8bf887026ea --- /dev/null +++ b/sys-boot/yaboot/files/e2fsprogs-1.42.13-sysmacros.h.patch @@ -0,0 +1,85 @@ +From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Fri, 19 May 2017 13:25:59 -0400 +Subject: [PATCH] include sys/sysmacros.h as needed + +The minor/major/makedev macros are not entirely standard. glibc has had +the definitions in sys/sysmacros.h since the start, and wants to move away +from always defining them implicitly via sys/types.h (as this pollutes the +namespace in violation of POSIX). Other C libraries have already dropped +them. Since the configure script already checks for this header, use that +to pull in the header in files that use these macros. + +Signed-off-by: Mike Frysinger +Signed-off-by: Theodore Ts'o +--- + lib/blkid/devname.c| 3 +++ + lib/blkid/devno.c | 3 +++ + lib/ext2fs/finddev.c | 3 +++ + lib/ext2fs/ismounted.c | 3 +++ + misc/mk_hugefiles.c| 3 +++ + 7 files changed, 22 insertions(+) + +--- a/lib/blkid/devname.c b/lib/blkid/devname.c +@@ -36,6 +36,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + #include + + #include "blkidP.h" +--- a/lib/blkid/devno.c b/lib/blkid/devno.c +@@ -31,6 +31,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "blkidP.h" + +--- a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c +@@ -31,6 +31,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "ext2_fs.h" + #include "ext2fs.h" +--- a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c +@@ -49,6 +49,9 @@ + #endif /* HAVE_GETMNTINFO */ + #include + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "ext2_fs.h" + #include "ext2fs.h" +--- a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c +@@ -35,6 +35,9 @@ extern int optind; + #include + #include + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + #include + #include + #include +-- +2.20.1 + diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild new file mode 100644 index 000..b127a5072d3 --- /dev/null +++ b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2019 Gentoo Authors +#
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/files/
commit: 102e553b6f9625e8dd1665296671ac9e8b603067
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Jan 16 07:12:12 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Jan 16 07:15:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102e553b
sys-boot/yaboot: make patches appliable with 'patch -p1'
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-boot/yaboot/files/chrpfix.patch| 4 ++--
sys-boot/yaboot/files/new-ofpath-devspec.patch | 4 ++--
sys-boot/yaboot/files/yaboot-stubfuncs.patch | 8
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-boot/yaboot/files/chrpfix.patch
b/sys-boot/yaboot/files/chrpfix.patch
index e64369ba899..59ea7a07263 100644
--- a/sys-boot/yaboot/files/chrpfix.patch
+++ b/sys-boot/yaboot/files/chrpfix.patch
@@ -1,5 +1,5 @@
Makefile.orig 2004-03-22 12:04:32.056149336 -0600
-+++ Makefile 2004-03-22 12:05:51.824138328 -0600
+--- a/Makefile.orig2004-03-22 12:04:32.056149336 -0600
b/Makefile 2004-03-22 12:05:51.824138328 -0600
@@ -103,9 +103,11 @@
all: yaboot addnote mkofboot
diff --git a/sys-boot/yaboot/files/new-ofpath-devspec.patch
b/sys-boot/yaboot/files/new-ofpath-devspec.patch
index ac03c15d8dd..e9ad749d8f0 100644
--- a/sys-boot/yaboot/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot/files/new-ofpath-devspec.patch
@@ -1,5 +1,5 @@
ybin/ofpath.bak2012-05-09 12:24:51.709911981 -0400
-+++ ybin/ofpath2012-05-09 12:32:19.661560544 -0400
+--- a/ybin/ofpath.bak 2012-05-09 12:24:51.709911981 -0400
b/ybin/ofpath 2012-05-09 12:32:19.661560544 -0400
@@ -85,11 +85,20 @@
[ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index 8ae522b7d4e..ba6fcc7b360 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,7 +1,7 @@
Stub out some functions that are not provided (and unneeded)
lib/malloc.c
-+++ lib/malloc.c
+--- a/lib/malloc.c
b/lib/malloc.c
@@ -64,6 +64,15 @@ void *malloc (unsigned int size)
return caddr;
}
@@ -18,8 +18,8 @@ Stub out some functions that are not provided (and unneeded)
/* Do not fall back to the malloc above as posix_memalign is needed by
* external libraries not yaboot */
int posix_memalign(void **memptr, size_t alignment, size_t size)
lib/nonstd.c
-+++ lib/nonstd.c
+--- a/lib/nonstd.c
b/lib/nonstd.c
@@ -65,3 +65,208 @@
{
return NULL;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/yaboot/
commit: 9d3d9bc8d7bba1ee3e3e6839066287d0d857f0f3 Author: Michał Górny gentoo org> AuthorDate: Sun May 8 05:18:20 2016 + Commit: Michał Górny gentoo org> CommitDate: Sun May 8 05:19:34 2016 + 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 @@ p...@gentoo.org Gentoo Linux PowerPC Development - - p...@gentoo.org - Gentoo Linux PowerPC Development -
