From f5c3980633523636cd5094209a1dbf4eaa94603e Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 29 Nov 2004 19:21:46 +0000 Subject: [PATCH] fake: silo: fix compile with linux-2.6.9 headers add [CORE] flag - sparc bootloader.... [2004112520435922203] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4931 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/sparc/silo/linux-2.6.9.patch | 66 ++++++++++++++++++++++++++++ package/sparc/silo/silo.desc | 1 + 2 files changed, 67 insertions(+) create mode 100644 package/sparc/silo/linux-2.6.9.patch diff --git a/package/sparc/silo/linux-2.6.9.patch b/package/sparc/silo/linux-2.6.9.patch new file mode 100644 index 000000000..c1d6f2cbd --- /dev/null +++ b/package/sparc/silo/linux-2.6.9.patch @@ -0,0 +1,66 @@ +--- ./silo/silo.c.orig 2004-11-24 20:02:18.884240368 +0100 ++++ ./silo/silo.c 2004-11-24 20:02:44.857291864 +0100 +@@ -49,6 +49,11 @@ + # define _LINUX_STRING_H_ + #endif + #ifdef __linux__ ++/* for linux-2.6.9, from linux/types.h */ ++# include ++# ifndef pgoff_t ++# define pgoff_t unsigned long ++# endif + # include + # include + # include +--- ./silo/silocheck.c.orig 2004-11-24 20:03:04.171355680 +0100 ++++ ./silo/silocheck.c 2004-11-24 20:03:21.014795088 +0100 +@@ -35,6 +35,11 @@ + # define _LINUX_STRING_H_ + #endif + #ifdef __linux__ ++/* for linux-2.6.9, from linux/types.h */ ++# include ++# ifndef pgoff_t ++# define pgoff_t unsigned long ++# endif + # include + # include + # include +--- ./second/fs/romfs.c.orig 2004-11-24 19:59:31.633666320 +0100 ++++ ./second/fs/romfs.c 2004-11-24 19:59:42.377033080 +0100 +@@ -25,6 +25,20 @@ + #include + #include + #include ++ ++#ifdef __CHECKER__ ++#define __bitwise __attribute__((bitwise)) ++#else ++#define __bitwise ++#endif ++ ++typedef __u16 __bitwise __le16; ++typedef __u16 __bitwise __be16; ++typedef __u32 __bitwise __le32; ++typedef __u32 __bitwise __be32; ++typedef __u64 __bitwise __le64; ++typedef __u64 __bitwise __be64; ++ + #include + + /* Reuse and abuse */ +--- ./second/fs/ufs.c.orig 2004-11-24 20:01:10.061702984 +0100 ++++ ./second/fs/ufs.c 2004-11-24 20:01:34.434997680 +0100 +@@ -33,6 +33,12 @@ + + struct inode { unsigned int blah; }; + ++/* for linux-2.6.9, from linux/types.h */ ++#include ++#ifndef pgoff_t ++#define pgoff_t unsigned long ++#endif ++ + #include + + /* Reuse and abuse */ diff --git a/package/sparc/silo/silo.desc b/package/sparc/silo/silo.desc index ff8bd561c..829731e39 100644 --- a/package/sparc/silo/silo.desc +++ b/package/sparc/silo/silo.desc @@ -40,6 +40,7 @@ [M] unmaintained [C] base/boot +[F] CORE [R] + sparc [L] GPL