karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

clockspeed: reworked patchset

user/amery/next/luajit
Christian Wiese 14 years ago committed by Christian Wiese
parent
21c63eb4a2
commit
770fd4d0f0
6 changed files with 217 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      network/clockspeed/0001-make-makelib.sh.patch
  2. 54
      network/clockspeed/0002-include-errno.h.patch
  3. 39
      network/clockspeed/0003-include-time.h.patch
  4. 52
      network/clockspeed/0004-head_n.patch
  5. 101
      network/clockspeed/0005-use-localstatedir.patch
  6. 27
      network/clockspeed/0006-cross-compile.patch

24
network/clockspeed/makelib.patch → network/clockspeed/0001-make-makelib.sh.patch
Unescape View File

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/makelib.patch
# Copyright (C) 2008 The OpenSDE Project
# Filename: package/.../clockspeed/0001-make-makelib.sh.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,8 +14,19 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./make-makelib.sh.orig 2008-03-10 23:58:08.000000000 +0000
+++ ./make-makelib.sh 2008-03-10 23:58:46.000000000 +0000
From 41ab756f8c4c2216b1e9a53bee04ad6749558ce4 Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 14:11:40 +0200
Subject: [PATCH 1/6] make-makelib.sh: fix to not hardcode 'ar' and 'ranlib'
---
make-makelib.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/make-makelib.sh b/make-makelib.sh
index d6b7c8c..ea0a6ab 100644
--- a/make-makelib.sh
+++ b/make-makelib.sh
@@ -1,6 +1,6 @@
echo 'main="$1"; shift'
echo 'rm -f "$main"'
@ -24,7 +35,7 @@
case "$1" in
sunos-5.*) ;;
@@ -11,6 +11,6 @@
@@ -11,6 +11,6 @@ dgux-*) ;;
hp-ux-*) ;;
sco*) ;;
*)
@ -32,3 +43,6 @@
+ echo '${RANLIB:-ranlib} "$main"'
;;
esac
--
1.6.6.2

54
network/clockspeed/0002-include-errno.h.patch
Unescape View File

@ -0,0 +1,54 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/0002-include-errno.h.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From 65180e22ec2fca4e65181e6bc00f94a6d26e5c8a Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 14:19:53 +0200
Subject: [PATCH 2/6] fixed to include errno.h
---
error.h | 2 +-
leapsecs_read.c | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/error.h b/error.h
index 01bd3dc..5d98c6b 100644
--- a/error.h
+++ b/error.h
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
-extern int errno;
+#include <errno.h>
extern int error_intr;
extern int error_nomem;
diff --git a/leapsecs_read.c b/leapsecs_read.c
index 62c8712..c8f975f 100644
--- a/leapsecs_read.c
+++ b/leapsecs_read.c
@@ -2,7 +2,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-extern int errno;
#include "tai.h"
#include "leapsecs.h"
--
1.6.6.2

39
network/clockspeed/0003-include-time.h.patch
Unescape View File

@ -0,0 +1,39 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/0003-include-time.h.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From 17b43b9682da7098a4325d6bce4eb9e882f6e8b9 Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 15:12:51 +0200
Subject: [PATCH 3/6] clockview: fixed to include time.h for localtime function
---
clockview.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/clockview.c b/clockview.c
index 1e23519..74ace31 100644
--- a/clockview.c
+++ b/clockview.c
@@ -1,5 +1,6 @@
#include <sys/types.h>
#include <sys/time.h>
+#include <time.h> /* localtime */
#include "substdio.h"
#include "readwrite.h"
#include "strerr.h"
--
1.6.6.2

52
network/clockspeed/0004-head_n.patch
Unescape View File

@ -0,0 +1,52 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/0004-head_n.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From 4926d1434666292a01fd3071bb8b7c0c9cbc3e93 Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 14:25:32 +0200
Subject: [PATCH 4/6] Makefile: fix to use 'head -n 1' instead of 'head -1'
---
Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d632e9b..c9baad6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ default: it
auto-ccld.sh: \
conf-cc conf-ld warn-auto.sh
( cat warn-auto.sh; \
- echo CC=\'`head -1 conf-cc`\'; \
- echo LD=\'`head -1 conf-ld`\' \
+ echo CC=\'`head -n 1 conf-cc`\'; \
+ echo LD=\'`head -n 1 conf-ld`\' \
) > auto-ccld.sh
auto-str: \
@@ -21,7 +21,7 @@ compile auto-str.c substdio.h readwrite.h exit.h
auto_home.c: \
auto-str conf-home
- ./auto-str auto_home `head -1 conf-home` > auto_home.c
+ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c
auto_home.o: \
compile auto_home.c
--
1.6.6.2

101
network/clockspeed/t2_fixes.patch → network/clockspeed/0005-use-localstatedir.patch
Unescape View File

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/t2_fixes.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Filename: package/.../clockspeed/0005-use-localstatedir.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -13,33 +13,23 @@
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -urN clockspeed-0.62.orig/Makefile clockspeed-0.62/Makefile
--- clockspeed-0.62.orig/Makefile 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/Makefile 2005-02-12 16:49:11.000000000 +0100
@@ -7,8 +7,8 @@
auto-ccld.sh: \
conf-cc conf-ld warn-auto.sh
( cat warn-auto.sh; \
- echo CC=\'`head -1 conf-cc`\'; \
- echo LD=\'`head -1 conf-ld`\' \
+ echo CC=\'`head -n 1 conf-cc`\'; \
+ echo LD=\'`head -n 1 conf-ld`\' \
) > auto-ccld.sh
auto-str: \
@@ -21,7 +21,7 @@
auto_home.c: \
auto-str conf-home
- ./auto-str auto_home `head -1 conf-home` > auto_home.c
+ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c
auto_home.o: \
compile auto_home.c
diff -urN clockspeed-0.62.orig/clockspeed.c clockspeed-0.62/clockspeed.c
--- clockspeed-0.62.orig/clockspeed.c 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/clockspeed.c 2005-02-12 21:15:24.384731032 +0100
@@ -83,7 +83,7 @@
From c07880a1f68386eedfa63d114ebd785dd341ac6e Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 14:29:52 +0200
Subject: [PATCH 5/6] change directory for adjust fifo, atto and leapsecs.dat file from /etc -> /var/state/clockspeed
---
clockspeed.c | 12 ++++++------
hier.c | 5 +++--
leapsecs_read.c | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/clockspeed.c b/clockspeed.c
index 18a7383..ec425bf 100644
--- a/clockspeed.c
+++ b/clockspeed.c
@@ -83,7 +83,7 @@ void savederiv()
if (deriv <= 0) return;
if (deriv > 200000000) return; /* 5Hz ticks? be serious */
@ -48,7 +38,7 @@ diff -urN clockspeed-0.62.orig/clockspeed.c clockspeed-0.62/clockspeed.c
if (fd == -1) return;
buf[0] = 0;
@@ -119,7 +119,7 @@
@@ -119,7 +119,7 @@ void savederiv()
if (fsync(fd) == -1) { close(fd); return; }
if (close(fd) == -1) return; /* NFS stupidity */
@ -57,7 +47,7 @@ diff -urN clockspeed-0.62.orig/clockspeed.c clockspeed-0.62/clockspeed.c
}
void main()
@@ -136,16 +136,16 @@
@@ -136,16 +136,16 @@ void main()
if (chdir(auto_home) == -1) _exit(1);
umask(033);
@ -78,31 +68,10 @@ diff -urN clockspeed-0.62.orig/clockspeed.c clockspeed-0.62/clockspeed.c
now(&first);
diff -urN clockspeed-0.62.orig/clockview.c clockspeed-0.62/clockview.c
--- clockspeed-0.62.orig/clockview.c 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/clockview.c 2005-02-12 16:52:25.000000000 +0100
@@ -1,5 +1,5 @@
#include <sys/types.h>
-#include <sys/time.h>
+#include <time.h>
#include "substdio.h"
#include "readwrite.h"
#include "strerr.h"
diff -urN clockspeed-0.62.orig/error.h clockspeed-0.62/error.h
--- clockspeed-0.62.orig/error.h 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/error.h 2005-02-12 16:57:50.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
-extern int errno;
+#include <errno.h>
extern int error_intr;
extern int error_nomem;
diff -urN clockspeed-0.62.orig/hier.c clockspeed-0.62/hier.c
--- clockspeed-0.62.orig/hier.c 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/hier.c 2005-02-12 21:54:50.393043096 +0100
diff --git a/hier.c b/hier.c
index 3d66beb..5083582 100644
--- a/hier.c
+++ b/hier.c
@@ -2,11 +2,12 @@
void hier()
@ -118,18 +87,11 @@ diff -urN clockspeed-0.62.orig/hier.c clockspeed-0.62/hier.c
d(auto_home,"bin",-1,-1,0755);
d(auto_home,"man",-1,-1,0755);
d(auto_home,"man/man1",-1,-1,0755);
diff -urN clockspeed-0.62.orig/leapsecs_read.c clockspeed-0.62/leapsecs_read.c
--- clockspeed-0.62.orig/leapsecs_read.c 1998-10-13 19:37:49.000000000 +0200
+++ clockspeed-0.62/leapsecs_read.c 2005-02-12 21:28:04.674149472 +0100
@@ -2,7 +2,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-extern int errno;
#include "tai.h"
#include "leapsecs.h"
@@ -18,7 +17,7 @@
diff --git a/leapsecs_read.c b/leapsecs_read.c
index c8f975f..5266e60 100644
--- a/leapsecs_read.c
+++ b/leapsecs_read.c
@@ -17,7 +17,7 @@ int leapsecs_read()
int i;
struct tai u;
@ -138,3 +100,6 @@ diff -urN clockspeed-0.62.orig/leapsecs_read.c clockspeed-0.62/leapsecs_read.c
if (fd == -1) {
if (errno != ENOENT) return -1;
if (leapsecs) free(leapsecs);
--
1.6.6.2

27
network/clockspeed/x-cross.patch → network/clockspeed/0006-cross-compile.patch
Unescape View File

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clockspeed/x-cross.patch
# Copyright (C) 2006 The T2 SDE Project
# Filename: package/.../clockspeed/0006-cross-compile.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,9 +14,20 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- clockspeed-0.62/Makefile 2006-01-02 22:00:37.000000000 +0100
+++ clockspeed-0.62/Makefile 2006-01-02 23:04:32.000000000 +0100
@@ -21,7 +21,7 @@
From 4cc77d2f2b6fe10cbce304dc2e551aeecb9e2de4 Mon Sep 17 00:00:00 2001
From: Christian Wiese <[email protected]>
Date: Thu, 29 Sep 2011 15:05:49 +0200
Subject: [PATCH 6/6] Makefile: fixed cross-compiling
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c9baad6..11b7e48 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ compile auto-str.c substdio.h readwrite.h exit.h
auto_home.c: \
auto-str conf-home
@ -25,7 +36,7 @@
auto_home.o: \
compile auto_home.c
@@ -153,8 +153,8 @@
@@ -153,7 +153,7 @@ trymkffo.c compile load
hasrdtsc.h: \
tryrdtsc.c compile load
@ -34,4 +45,6 @@
) >/dev/null 2>&1 \
&& echo \#define HASRDTSC 1 || exit 0 ) > hasrdtsc.h
rm -f tryrdtsc.o tryrdtsc
--
1.6.6.2
Write Preview
Loading…
Cancel
Save