r534 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Tue Jan 8 18:16:20 UTC 2008
Author: waldi
Date: Tue Jan 8 18:16:20 2008
New Revision: 534
Log:
* debian/changelog: Update.
* debian/patches/series: Add drop-realtime.patch.
* debian/patches/drop-realtime.patch: Add.
Added:
lvm2/trunk/debian/patches/drop-realtime.patch
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/patches/series
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog (original)
+++ lvm2/trunk/debian/changelog Tue Jan 8 18:16:20 2008
@@ -1,10 +1,10 @@
-lvm2 (2.02.29) UNRELEASED; urgency=low
+lvm2 (2.02.29-1) UNRELEASED; urgency=low
* New upstream version.
* Load modules.
- * Don't longer directly link libncurses and libselinux.
+ * Don't longer directly link libncurses, libselinux and librt.
- -- Bastian Blank <waldi at debian.org> Tue, 08 Jan 2008 18:01:10 +0000
+ -- Bastian Blank <waldi at debian.org> Tue, 08 Jan 2008 18:15:32 +0000
lvm2 (2.02.26-1) unstable; urgency=low
Added: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/patches/drop-realtime.patch Tue Jan 8 18:16:20 2008
@@ -0,0 +1,239 @@
+--- trunk.orig/lib/Makefile.in
++++ trunk/lib/Makefile.in
+@@ -79,7 +79,6 @@
+ misc/lvm-file.c \
+ misc/lvm-string.c \
+ misc/lvm-wrappers.c \
+- misc/timestamp.c \
+ misc/util.c \
+ mm/memlock.c \
+ report/report.c \
+--- trunk.orig/lib/misc/timestamp.c
++++ /dev/null
+@@ -1,130 +0,0 @@
+-/*
+- * Copyright (C) 2006 Rackable Systems All rights reserved.
+- *
+- * This file is part of LVM2.
+- *
+- * This copyrighted material is made available to anyone wishing to use,
+- * modify, copy, or redistribute it subject to the terms and conditions
+- * of the GNU Lesser General Public License v.2.1.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with this program; if not, write to the Free Software Foundation,
+- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- */
+-
+-/*
+- * Abstract out the time methods used so they can be adjusted later -
+- * the results of these routines should stay in-core. This implementation
+- * requires librt.
+- */
+-
+-#include "lib.h"
+-#include <stdlib.h>
+-
+-#include "timestamp.h"
+-
+-/*
+- * The realtime section uses clock_gettime with the CLOCK_MONOTONIC
+- * parameter to prevent issues with time warps
+- */
+-#ifdef HAVE_REALTIME
+-
+-#include <time.h>
+-#include <bits/time.h>
+-
+-struct timestamp {
+- struct timespec t;
+-};
+-
+-struct timestamp *get_timestamp(void)
+-{
+- struct timestamp *ts = NULL;
+-
+- if (!(ts = dm_malloc(sizeof(*ts))))
+- return_NULL;
+-
+- if (clock_gettime(CLOCK_MONOTONIC, &ts->t)) {
+- log_sys_error("clock_gettime", "get_timestamp");
+- return NULL;
+- }
+-
+- return ts;
+-}
+-
+-/* cmp_timestamp: Compare two timestamps
+- *
+- * Return: -1 if t1 is less than t2
+- * 0 if t1 is equal to t2
+- * 1 if t1 is greater than t2
+- */
+-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
+-{
+- if(t1->t.tv_sec < t2->t.tv_sec)
+- return -1;
+- if(t1->t.tv_sec > t2->t.tv_sec)
+- return 1;
+-
+- if(t1->t.tv_nsec < t2->t.tv_nsec)
+- return -1;
+- if(t1->t.tv_nsec > t2->t.tv_nsec)
+- return 1;
+-
+- return 0;
+-}
+-
+-#else /* ! HAVE_REALTIME */
+-
+-/*
+- * The !realtime section just uses gettimeofday and is therefore subject
+- * to ntp-type time warps - not sure if should allow that.
+- */
+-
+-#include <sys/time.h>
+-
+-struct timestamp {
+- struct timeval t;
+-};
+-
+-struct timestamp *get_timestamp(void)
+-{
+- struct timestamp *ts = NULL;
+-
+- if (!(ts = dm_malloc(sizeof(*ts))))
+- return_NULL;
+-
+- if (gettimeofday(&ts->t, NULL)) {
+- log_sys_error("gettimeofday", "get_timestamp");
+- return NULL;
+- }
+-
+- return ts;
+-}
+-
+-/* cmp_timestamp: Compare two timestamps
+- *
+- * Return: -1 if t1 is less than t2
+- * 0 if t1 is equal to t2
+- * 1 if t1 is greater than t2
+- */
+-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
+-{
+- if(t1->t.tv_sec < t2->t.tv_sec)
+- return -1;
+- if(t1->t.tv_sec > t2->t.tv_sec)
+- return 1;
+-
+- if(t1->t.tv_usec < t2->t.tv_usec)
+- return -1;
+- if(t1->t.tv_usec > t2->t.tv_usec)
+- return 1;
+-
+- return 0;
+-}
+-
+-#endif /* HAVE_REALTIME */
+-
+-void destroy_timestamp(struct timestamp *t)
+-{
+- if (t)
+- dm_free(t);
+-}
+--- trunk.orig/lib/misc/timestamp.h
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright (C) 2006 Rackable Systems All rights reserved.
+- *
+- * This file is part of LVM2.
+- *
+- * This copyrighted material is made available to anyone wishing to use,
+- * modify, copy, or redistribute it subject to the terms and conditions
+- * of the GNU Lesser General Public License v.2.1.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with this program; if not, write to the Free Software Foundation,
+- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- */
+-
+-#ifndef _LVM_TIMESTAMP_H
+-#define _LVM_TIMESTAMP_H
+-
+-struct timestamp;
+-
+-struct timestamp *get_timestamp(void);
+-
+-/* cmp_timestamp: Compare two timestamps
+- *
+- * Return: -1 if t1 is less than t2
+- * 0 if t1 is equal to t2
+- * 1 if t1 is greater than t2
+- */
+-int cmp_timestamp(struct timestamp *t1, struct timestamp *t2);
+-
+-void destroy_timestamp(struct timestamp *t);
+-
+-#endif /* _LVM_TIMESTAMP_H */
+-
+--- trunk.orig/configure.in
++++ trunk/configure.in
+@@ -42,7 +42,6 @@
+ LIB_SUFFIX="so"
+ DEVMAPPER=yes
+ ODIRECT=yes
+- REALTIME=yes
+ CLUSTER=internal
+ FSADM=no ;;
+ darwin*)
+@@ -56,7 +55,6 @@
+ LIB_SUFFIX="dylib"
+ DEVMAPPER=yes
+ ODIRECT=no
+- REALTIME=no
+ CLUSTER=none
+ FSADM=no ;;
+ esac
+@@ -277,13 +275,6 @@
+ fi
+
+ ################################################################################
+-dnl -- Disable realtime clock support
+-AC_MSG_CHECKING(whether to enable realtime support)
+-AC_ARG_ENABLE(realtime, [ --disable-realtime Disable realtime clock support],
+-REALTIME=$enableval)
+-AC_MSG_RESULT($REALTIME)
+-
+-################################################################################
+ dnl -- Build cluster LVM daemon
+ AC_MSG_CHECKING(whether to build cluster LVM daemon)
+ AC_ARG_WITH(clvmd,
+@@ -411,19 +402,6 @@
+ fi
+
+ ################################################################################
+-dnl -- Check for realtime clock support
+-if test x$REALTIME = xyes; then
+- AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
+-
+- if test x$HAVE_REALTIME = xyes; then
+- AC_DEFINE([HAVE_REALTIME], 1, [Define to 1 to include support for realtime clock.])
+- LIBS="-lrt $LIBS"
+- else
+- AC_MSG_WARN(Disabling realtime clock)
+- fi
+-fi
+-
+-################################################################################
+ dnl -- Check for getopt
+ AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 to if getopt_long is available.]))
+
+@@ -557,7 +535,6 @@
+ AC_SUBST(DEBUG)
+ AC_SUBST(DEVMAPPER)
+ AC_SUBST(HAVE_LIBDL)
+-AC_SUBST(HAVE_REALTIME)
+ AC_SUBST(CMDLIB)
+ AC_SUBST(MSGFMT)
+ AC_SUBST(LOCALEDIR)
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series (original)
+++ lvm2/trunk/debian/patches/series Tue Jan 8 18:16:20 2008
@@ -1,2 +1,3 @@
install.patch
libs-cleanup.patch
+drop-realtime.patch
More information about the pkg-lvm-commits
mailing list