[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: hurd: revert clock_settime(MONOTONIC) patch, it's supposed to fail



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 26eeb93d1826bf5a56b89ac4d161f982ab7314c7
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Oct 12 07:29:55 2017 +0200

    hurd: revert clock_settime(MONOTONIC) patch, it's supposed to fail
---
 debian/changelog                                            |  2 +-
 debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18c598d..1035731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ glibc (2.24-18) UNRELEASED; urgency=medium
   * patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff: Always define SA_SIGINFO.
   * patches/hurd-i386/local-no_unsupported_ioctls.diff: New patch.
   * patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: Complete with
-    clock_getres() and clock_settime().
+    clock_getres().
 
   [ Svante Signell ]
   * patches/hurd-i386/submitted-exec_filename.diff: Update, fixes
diff --git a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
index 34920db..2ac7973 100644
--- a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
+++ b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
@@ -34,18 +34,6 @@ Index: glibc-2.24/sysdeps/posix/clock_getres.c
        retval = realtime_getres (res);
        break;
  #endif	/* handled REALTIME */
-Index: glibc-2.24/sysdeps/unix/clock_settime.c
-===================================================================
---- glibc-2.24.orig/sysdeps/unix/clock_settime.c
-+++ glibc-2.24/sysdeps/unix/clock_settime.c
-@@ -99,6 +99,7 @@ __clock_settime (clockid_t clock_id, con
- 
- #ifndef HANDLED_REALTIME
-     case CLOCK_REALTIME:
-+    case CLOCK_MONOTONIC:
-       HANDLE_REALTIME;
-       break;
- #endif
 Index: glibc-2.24/sysdeps/pthread/timer_create.c
 ===================================================================
 --- glibc-2.24.orig/sysdeps/pthread/timer_create.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: