[yaboot] Force the linker to use elf32

Tony Breeds tbreeds at fedoraproject.org
Wed Aug 31 05:30:55 UTC 2011


commit 934bf6ca3d00e3183a504c6b3d61527323e1df2d
Author: Tony Breeds <tony at bakeyournoodle.com>
Date:   Wed Aug 31 15:28:36 2011 +1000

    Force the linker to use elf32
    
    Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>

 yaboot-ppc64.patch |    8 --------
 yaboot.spec        |    5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/yaboot-ppc64.patch b/yaboot-ppc64.patch
index a86d18b..1ed2d54 100644
--- a/yaboot-ppc64.patch
+++ b/yaboot-ppc64.patch
@@ -11,12 +11,4 @@
  YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
  YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
  YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
-@@ -66,7 +66,7 @@
- 
- # Link flags
- #
--LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
-+LFLAGS = -Ttext $(TEXTADDR) -Bstatic 
 
- # Libraries
- #
diff --git a/yaboot.spec b/yaboot.spec
index 865ede0..13dec83 100644
--- a/yaboot.spec
+++ b/yaboot.spec
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -149,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Wed Aug 31 2011 Tony Breeds <tony at bakeyournoodle.com> - 1.3.16-5
+- yaboot-ppc64.patch incorrectly removed the -melfppc32linux from LDFLAGS.  DOn't know why this hasn't been a problem 'til now.
+
 * Thu Aug 11 2011 Tony Breeds <tony at bakeyournoodle.com> - 1.3.16-4
 - truncate memcpy() extract_vendor_options() to avoid clobbering the stack. (closes 729684)
 


More information about the scm-commits mailing list