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.

60 lines
2.6 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/lvm/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 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. The usual gcc-3.4.0 fixes.
  20. - Rene Rebe <rene@exactcode.de>
  21. diff -ur 1.0.8-orig/tools/lib/pv_read_all_pv_of_vg.c 1.0.8/tools/lib/pv_read_all_pv_of_vg.c
  22. --- 1.0.8-orig/tools/lib/pv_read_all_pv_of_vg.c 2003-09-03 17:16:08.000000000 +0200
  23. +++ 1.0.8/tools/lib/pv_read_all_pv_of_vg.c 2004-05-02 23:31:36.000000000 +0200
  24. @@ -130,6 +130,7 @@
  25. }
  26. pv_this[p] = NULL;
  27. uuid_check_end:
  28. + ((void)0);
  29. }
  30. for ( pp = 0; pp < p - 2; pp++) {
  31. if ( pv_this[pp] == NULL) {
  32. diff -ur 1.0.8-orig/tools/lib/pv_read_uuidlist.c 1.0.8/tools/lib/pv_read_uuidlist.c
  33. --- 1.0.8-orig/tools/lib/pv_read_uuidlist.c 2003-02-06 16:05:34.000000000 +0100
  34. +++ 1.0.8/tools/lib/pv_read_uuidlist.c 2004-05-02 23:32:29.000000000 +0200
  35. @@ -50,7 +50,7 @@
  36. static char *this_pv_uuidlist = NULL;
  37. int num;
  38. - debug_enter(__FUNCTION__ " -- CALLED with %s\n", pv ? pv->pv_name : "NULL");
  39. + debug_enter("%s -- CALLED with %s\n", __FUNCTION__, pv ? pv->pv_name : "NULL");
  40. if (pv == NULL || pv_uuidlist == NULL)
  41. return -LVM_EPARAM;
  42. diff -ur 1.0.8-orig/tools/lib/pv_write_uuidlist.c 1.0.8/tools/lib/pv_write_uuidlist.c
  43. --- 1.0.8-orig/tools/lib/pv_write_uuidlist.c 2003-02-06 16:05:34.000000000 +0100
  44. +++ 1.0.8/tools/lib/pv_write_uuidlist.c 2004-05-02 23:34:26.000000000 +0200
  45. @@ -71,7 +71,8 @@
  46. /* Create/fix UUIDs for any PVs that need it */
  47. if (lvm_check_uuid(pv->pv_uuid) < 0) {
  48. - debug(__FUNCTION__ " -- creating new UUID for PV %s\n",
  49. + debug("%s -- creating new UUID for PV %s\n",
  50. + __FUNCTION__,
  51. pv->pv_name);
  52. memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid));
  53. memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN);