From 8dfb999794602be2b0eb0fe64546d1f3656880f6 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 19:04:53 +0000 Subject: [PATCH] Rene Rebe: fixed lvm for gcc-3.4.0 [2004050300011617357] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2908 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/lvm/gcc34.patch | 60 ++++++++++++++++++++++++++++++++++++ package/base/lvm/lvm.conf | 2 +- package/base/lvm/lvm.desc | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 package/base/lvm/gcc34.patch diff --git a/package/base/lvm/gcc34.patch b/package/base/lvm/gcc34.patch new file mode 100644 index 000000000..75eefbf9a --- /dev/null +++ b/package/base/lvm/gcc34.patch @@ -0,0 +1,60 @@ +# --- 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/lvm/gcc34.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 --- + + +The usual gcc-3.4.0 fixes. + + - Rene Rebe + +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 +--- 1.0.8-orig/tools/lib/pv_read_all_pv_of_vg.c 2003-09-03 17:16:08.000000000 +0200 ++++ 1.0.8/tools/lib/pv_read_all_pv_of_vg.c 2004-05-02 23:31:36.000000000 +0200 +@@ -130,6 +130,7 @@ + } + pv_this[p] = NULL; + uuid_check_end: ++ ((void)0); + } + for ( pp = 0; pp < p - 2; pp++) { + if ( pv_this[pp] == NULL) { +diff -ur 1.0.8-orig/tools/lib/pv_read_uuidlist.c 1.0.8/tools/lib/pv_read_uuidlist.c +--- 1.0.8-orig/tools/lib/pv_read_uuidlist.c 2003-02-06 16:05:34.000000000 +0100 ++++ 1.0.8/tools/lib/pv_read_uuidlist.c 2004-05-02 23:32:29.000000000 +0200 +@@ -50,7 +50,7 @@ + static char *this_pv_uuidlist = NULL; + int num; + +- debug_enter(__FUNCTION__ " -- CALLED with %s\n", pv ? pv->pv_name : "NULL"); ++ debug_enter("%s -- CALLED with %s\n", __FUNCTION__, pv ? pv->pv_name : "NULL"); + + if (pv == NULL || pv_uuidlist == NULL) + return -LVM_EPARAM; +diff -ur 1.0.8-orig/tools/lib/pv_write_uuidlist.c 1.0.8/tools/lib/pv_write_uuidlist.c +--- 1.0.8-orig/tools/lib/pv_write_uuidlist.c 2003-02-06 16:05:34.000000000 +0100 ++++ 1.0.8/tools/lib/pv_write_uuidlist.c 2004-05-02 23:34:26.000000000 +0200 +@@ -71,7 +71,8 @@ + + /* Create/fix UUIDs for any PVs that need it */ + if (lvm_check_uuid(pv->pv_uuid) < 0) { +- debug(__FUNCTION__ " -- creating new UUID for PV %s\n", ++ debug("%s -- creating new UUID for PV %s\n", ++ __FUNCTION__, + pv->pv_name); + memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid)); + memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN); diff --git a/package/base/lvm/lvm.conf b/package/base/lvm/lvm.conf index 4ef9e512f..21b0fa5c7 100644 --- a/package/base/lvm/lvm.conf +++ b/package/base/lvm/lvm.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/lvm/lvm.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# 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 diff --git a/package/base/lvm/lvm.desc b/package/base/lvm/lvm.desc index df91cc9df..0771a6a84 100644 --- a/package/base/lvm/lvm.desc +++ b/package/base/lvm/lvm.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/lvm/lvm.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by