[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/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;
