Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 24425 Details for
Bug 31286
linux-utils-2.12 failes to compile when 2.6.0 headers are used
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
util-linux-2.11z-kernel-2.6.patch
util-linux-2.11z-kernel-2.6.patch (text/plain), 2.44 KB, created by
ferret
on 2004-01-25 19:43:49 UTC
(
hide
)
Description:
util-linux-2.11z-kernel-2.6.patch
Filename:
MIME Type:
Creator:
ferret
Created:
2004-01-25 19:43:49 UTC
Size:
2.44 KB
patch
obsolete
>diff -ruN util-linux-2.12.orig/disk-utils/blockdev.c util-linux-2.12/disk-utils/blockdev.c >--- util-linux-2.12.orig/disk-utils/blockdev.c 2002-03-08 23:57:02.000000000 +0100 >+++ util-linux-2.12/disk-utils/blockdev.c 2003-10-16 18:26:53.048373136 +0200 >@@ -9,6 +9,7 @@ > #include <string.h> > #include <unistd.h> > #include <sys/ioctl.h> >+#include <linux/version.h> > > #include "nls.h" > >@@ -24,8 +25,13 @@ > #define BLKRASET _IO(0x12,98) > #define BLKRAGET _IO(0x12,99) > #define BLKSSZGET _IO(0x12,104) >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) > #define BLKBSZGET _IOR(0x12,112,sizeof(int)) > #define BLKBSZSET _IOW(0x12,113,sizeof(int)) >+#else >+#define BLKBSZGET _IOR(0x12,112,int) >+#define BLKBSZSET _IOW(0x12,113,int) >+#endif > #endif > > /* Maybe <linux/hdreg.h> could be included */ >diff -ruN util-linux-2.12.orig/disk-utils/elvtune.c util-linux-2.12/disk-utils/elvtune.c >--- util-linux-2.12.orig/disk-utils/elvtune.c 2002-03-08 23:57:49.000000000 +0100 >+++ util-linux-2.12/disk-utils/elvtune.c 2003-10-16 18:26:53.048373136 +0200 >@@ -26,6 +26,8 @@ > #include <sys/ioctl.h> > #include <unistd.h> > #include <stdlib.h> >+#include <linux/version.h> >+ > #include "nls.h" > > /* this has to match with the kernel structure */ >@@ -37,8 +39,13 @@ > int max_bomb_segments; > } blkelv_ioctl_arg_t; > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) > #define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t)) > #define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t)) >+#else >+#define BLKELVGET _IOR(0x12,106,blkelv_ioctl_arg_t) >+#define BLKELVSET _IOW(0x12,107,blkelv_ioctl_arg_t) >+#endif > > static void > usage(void) { >diff -ruN util-linux-2.12.orig/fdisk/common.h util-linux-2.12/fdisk/common.h >--- util-linux-2.12.orig/fdisk/common.h 2003-07-13 15:59:53.000000000 +0200 >+++ util-linux-2.12/fdisk/common.h 2003-10-16 18:29:11.365345760 +0200 >@@ -2,11 +2,19 @@ > > /* including <linux/fs.h> fails */ > #include <sys/ioctl.h> >+#include <linux/version.h> >+ > #define BLKRRPART _IO(0x12,95) /* re-read partition table */ > #define BLKGETSIZE _IO(0x12,96) /* return device size */ > #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ > #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) >+#define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */ >+#else >+#define BLKGETSIZE64 _IOR(0x12,114,unsigned long long) >+#endif >+ > /* including <linux/hdreg.h> also fails */ > struct hd_geometry { > unsigned char heads;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 31286
:
19321
|
22999
| 24425