mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

55 lines
2.1 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/hdparm/glibc234.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. Conflicts with a readahead in the new glibc headers - bits/fcntl.h.
  20. - Rene Rebe <rene@rocklinux.org>
  21. --- hdparm-5.5/hdparm.c.orig 2004-05-02 22:37:10.000000000 +0200
  22. +++ hdparm-5.5/hdparm.c 2004-05-02 22:42:27.000000000 +0200
  23. @@ -52,7 +52,7 @@
  24. static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_scsi_cd = 0, is_xt_hd = 0;
  25. static int do_ctimings, do_timings = 0;
  26. -static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
  27. +static unsigned long set_readahead= 0, get_readahead= 0, rahead= 0;
  28. static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
  29. static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0;
  30. static unsigned long set_mult = 0, get_mult = 0, mult = 0;
  31. @@ -784,8 +784,8 @@
  32. if (set_readahead) {
  33. if (get_readahead)
  34. - printf(" setting fs readahead to %ld\n", readahead);
  35. - if (ioctl(fd, BLKRASET, readahead))
  36. + printf(" setting fs readahead to %ld\n", rahead);
  37. + if (ioctl(fd, BLKRASET, rahead))
  38. perror(" BLKRASET failed");
  39. }
  40. #ifdef HDIO_UNREGISTER_HWIF
  41. @@ -1829,7 +1829,7 @@
  42. case 'a':
  43. get_readahead = noisy;
  44. noisy = 1;
  45. - GET_NUMBER(set_readahead,readahead);
  46. + GET_NUMBER(set_readahead,rahead);
  47. break;
  48. case 'B':
  49. get_apmmode = noisy;