summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-12-24 11:43:24 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-12-24 11:43:24 +0000
commit12f749dea540360962458b34f1fc00485081edbd (patch)
tree5220019cbf8675b0f35adddf30dca4fdb60b02b4 /sys-fs/e2fsprogs/files
parentbumped stable 3 week test passed (diff)
downloadgentoo-2-12f749dea540360962458b34f1fc00485081edbd.tar.gz
gentoo-2-12f749dea540360962458b34f1fc00485081edbd.tar.bz2
gentoo-2-12f749dea540360962458b34f1fc00485081edbd.zip
Added a patch to get e2fsprogs to compile with 2.6 headers; closing bug #31419.
Diffstat (limited to 'sys-fs/e2fsprogs/files')
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
new file mode 100644
index 000000000000..afb9c7a27f1e
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
@@ -0,0 +1,19 @@
+diff -X /usr/src/dontdiff -urN e2fsprogs-old/misc/util.c e2fsprogs-1.34/misc/util.c
+--- e2fsprogs-old/misc/util.c Sat May 3 15:46:47 2003
++++ e2fsprogs-1.34/misc/util.c Tue Sep 30 06:56:11 2003
+@@ -108,13 +108,8 @@
+ #define MAJOR(dev) ((dev)>>8)
+ #define MINOR(dev) ((dev) & 0xff)
+ #endif
+-#ifndef SCSI_BLK_MAJOR
+-#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
+-#endif
+- if (((MAJOR(s.st_rdev) == HD_MAJOR &&
+- MINOR(s.st_rdev)%64 == 0) ||
+- (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) &&
+- MINOR(s.st_rdev)%16 == 0))) {
++ if (MAJOR(s.st_rdev) == HD_MAJOR &&
++ MINOR(s.st_rdev)%64 == 0) {
+ printf(_("%s is entire device, not just one partition!\n"),
+ device);
+ proceed_question();