@ -0,0 +1,55 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/hdparm/glibc234.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
|
|||
Conflicts with a readahead in the new glibc headers - bits/fcntl.h. |
|||
|
|||
- Rene Rebe <rene@rocklinux.org> |
|||
|
|||
--- hdparm-5.5/hdparm.c.orig 2004-05-02 22:37:10.000000000 +0200
|
|||
+++ hdparm-5.5/hdparm.c 2004-05-02 22:42:27.000000000 +0200
|
|||
@@ -52,7 +52,7 @@
|
|||
static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_scsi_cd = 0, is_xt_hd = 0; |
|||
static int do_ctimings, do_timings = 0; |
|||
|
|||
-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
|
|||
+static unsigned long set_readahead= 0, get_readahead= 0, rahead= 0;
|
|||
static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; |
|||
static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; |
|||
static unsigned long set_mult = 0, get_mult = 0, mult = 0; |
|||
@@ -784,8 +784,8 @@
|
|||
|
|||
if (set_readahead) { |
|||
if (get_readahead) |
|||
- printf(" setting fs readahead to %ld\n", readahead);
|
|||
- if (ioctl(fd, BLKRASET, readahead))
|
|||
+ printf(" setting fs readahead to %ld\n", rahead);
|
|||
+ if (ioctl(fd, BLKRASET, rahead))
|
|||
perror(" BLKRASET failed"); |
|||
} |
|||
#ifdef HDIO_UNREGISTER_HWIF |
|||
@@ -1829,7 +1829,7 @@
|
|||
case 'a': |
|||
get_readahead = noisy; |
|||
noisy = 1; |
|||
- GET_NUMBER(set_readahead,readahead);
|
|||
+ GET_NUMBER(set_readahead,rahead);
|
|||
break; |
|||
case 'B': |
|||
get_apmmode = noisy; |
@ -1,11 +0,0 @@ |
|||
--- ./libparted/linux.c.orig 2004-02-11 00:18:55.623764288 +0000
|
|||
+++ ./libparted/linux.c 2004-02-11 00:19:35.662677448 +0000
|
|||
@@ -164,7 +164,7 @@
|
|||
#define BLKSSZGET _IO(0x12,104) /* get block device sector size */ |
|||
#define BLKGETLASTSECT _IO(0x12,108) /* get last sector of block device */ |
|||
#define BLKSETLASTSECT _IO(0x12,109) /* set last sector of block device */ |
|||
-#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t)) /* return device size in bytes (u64 *arg) */
|
|||
+#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (u64 *arg) */
|
|||
|
|||
struct blkdev_ioctl_param { |
|||
unsigned int block; |
@ -0,0 +1,26 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/parted/parted.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
# the log2 definition conflicts with recent gcc buildins - which is normally |
|||
# only a warning ... |
|||
var_append GCC_WRAPPER_REMOVE " " "-Werror" |
|||
|