From cd1d7b22e52e0a46d8b1bc43aab7211bfcb8a093 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Fri, 26 Sep 2003 12:37:42 +0000 Subject: [PATCH] Dimitar Zhekov : Our activate.patch to lilo enables all "all:" targets, but pseudo.b requires bcc (and thus produces errors) and is only required for the diagnostics as far as I can see. So this patch disables pseudo.b by removing it from "all:". git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1495 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/x86/lilo/activate.patch | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index fa9c298a9..105413bf7 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -3,6 +3,7 @@ - Dimitar Zhekov: bash use installed readline option fixed reroot in makeimages.sh + disable lilo test4 / pseudo.b *) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/x86/lilo/activate.patch b/package/x86/lilo/activate.patch index d9e4ecd13..055a04b0e 100644 --- a/package/x86/lilo/activate.patch +++ b/package/x86/lilo/activate.patch @@ -20,14 +20,14 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./Makefile.orig 2003-07-09 14:02:59.000000000 -0600 -+++ ./Makefile 2003-07-09 14:03:19.000000000 -0600 +--- ./Makefile.orig 2003-06-30 06:45:19.000000000 +0300 ++++ ./Makefile 2003-09-21 17:25:38.000000000 +0300 @@ -104,7 +104,7 @@ .SUFFIXES: .img .b .com .S .s -all: lilo bootsect.b disk.com pseudo.b # $(BOOTS) edit dparam.com activate -+all: lilo bootsect.b disk.com pseudo.b $(BOOTS) edit dparam.com activate ++all: lilo bootsect.b disk.com $(BOOTS) edit dparam.com activate # pseudo.b if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then make diagnostic; fi #