From 5287bb953176cce026507fdd5feabc7e51c97fa3 Mon Sep 17 00:00:00 2001 From: fake Date: Fri, 24 Sep 2004 13:29:56 +0000 Subject: [PATCH] fake: silo: make some non-fatal error-messages go away on CD-boot by using the system's ext2_err.h (patch sent upstream) [2004092016331624277] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4397 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/sparc/silo/silo.conf | 5 +++++ package/sparc/silo/use-system-ext2_err-h.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/sparc/silo/use-system-ext2_err-h.patch diff --git a/package/sparc/silo/silo.conf b/package/sparc/silo/silo.conf index 77855f8f9..a30984d00 100644 --- a/package/sparc/silo/silo.conf +++ b/package/sparc/silo/silo.conf @@ -33,6 +33,11 @@ pm_silo() { } hook_add postmake 3 pm_silo + +# use the system's ext2_err.h includes, see also +# 'use-system-ext2_err-h.patch' +hook_add premake 1 "rm -f include/ext2fs/ext2_err.h" + var_append makeopt ' ' 'USELIB="-L $root/lib"' var_append makeinstopt ' ' 'DESTDIR=$root' diff --git a/package/sparc/silo/use-system-ext2_err-h.patch b/package/sparc/silo/use-system-ext2_err-h.patch new file mode 100644 index 000000000..08d39075a --- /dev/null +++ b/package/sparc/silo/use-system-ext2_err-h.patch @@ -0,0 +1,15 @@ +use the system's ext2_err.h includes, they differ depending on +wether we have 2.4 or 2.6 kernel includes. note, ext2_err.h gets +deleted in silo.conf... + +--- ./include/ext2fs/ext2fs.h.orig 2004-09-20 13:00:36.000000000 +0200 ++++ ./include/ext2fs/ext2fs.h 2004-09-20 13:00:58.000000000 +0200 +@@ -75,7 +75,7 @@ + #else + #include "et/com_err.h" + #include "ext2fs/ext2_io.h" +-#include "ext2fs/ext2_err.h" ++#include + #endif + + /*