From fa445ae97a3f65780ed94035aaa0d7e1269ab0d5 Mon Sep 17 00:00:00 2001 From: fake Date: Tue, 11 Apr 2006 16:02:52 +0000 Subject: [PATCH] fake: yaboot: set ROOT on non-crossbuild too, fixing stage1 native build, don't patch in CROSS=, rely on .conf sed, fixing native build in stage 5. [2006040917104911096] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7523 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/powerpc/yaboot/cross-compile.patch | 11 ----------- package/powerpc/yaboot/yaboot.conf | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package/powerpc/yaboot/cross-compile.patch b/package/powerpc/yaboot/cross-compile.patch index 07aa0f2ac..27a269ce0 100644 --- a/package/powerpc/yaboot/cross-compile.patch +++ b/package/powerpc/yaboot/cross-compile.patch @@ -1,14 +1,3 @@ ---- ./Makefile~ 2006-03-16 19:26:56.000000000 +0100 -+++ ./Makefile 2006-03-16 19:36:00.000000000 +0100 -@@ -26,7 +26,7 @@ - # Set this to the prefix of your cross-compiler, if you have one. - # Else leave it empty. - # --CROSS = -+CROSS = powerpc-unknown-linux-gnu- - - # The flags for the yaboot binary. - # --- yaboot-1.3.13/Makefile~ 2006-03-16 19:38:24.000000000 +0100 +++ yaboot-1.3.13/Makefile 2006-03-16 19:40:45.000000000 +0100 @@ -172,10 +172,10 @@ diff --git a/package/powerpc/yaboot/yaboot.conf b/package/powerpc/yaboot/yaboot.conf index 68af8bc94..b5fe814fd 100644 --- a/package/powerpc/yaboot/yaboot.conf +++ b/package/powerpc/yaboot/yaboot.conf @@ -39,5 +39,7 @@ yaboot_premake() { # tell yaboot how to cross-compile sed -i "s,^ROOT =,ROOT = $xroot," Makefile sed -i "s,^CROSS =,CROSS = $archprefix," Makefile + else + sed -i "s,^ROOT =,ROOT = $root," Makefile fi }