[Commits] : Tuxbox-GIT: cdk branch master updated. CVS-Final-12-gdf5e302
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: cdk branch master updated. CVS-Final-12-gdf5e302
|
From: Thilo G. <tux...@ne...> - 2013-11-10 13:18:37
|
Project "Tuxbox-GIT: cdk":
The branch, master has been updated
via df5e3029a8364dba9ef42a2cceeea4df65ffda38 (commit)
via 6f085a33febe95f12aacb49988fc96beece6c3c5 (commit)
via ecd43559f5dc54333ff24c7791f5d2d5566112cf (commit)
from f466c8331cf4c01cc3064f5cc20924d0dc41fbf4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit df5e3029a8364dba9ef42a2cceeea4df65ffda38
Author: GetAway <get...@t-...>
Date: Sun Nov 10 13:40:25 2013 +0100
version bump ccache-3.1.9
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/rules-archive b/rules-archive
index 219072d..07148aa 100644
--- a/rules-archive
+++ b/rules-archive
@@ -45,7 +45,7 @@ cloog-0.16.3.tar.gz;http://www.bastoul.net/cloog/pages/download
#
# ccache
#
-ccache-3.1.4.tar.gz;http://samba.org/ftp/ccache
+ccache-3.1.9.tar.gz;http://samba.org/ftp/ccache
#
# root
diff --git a/rules-make b/rules-make
index afa243e..37eca5a 100644
--- a/rules-make
+++ b/rules-make
@@ -169,7 +169,7 @@ nano;1.2.4;nano-1.2.4;nano-1.2.4.tar.gz:nano.diff;extract:nano-1.2.4.tar.gz;patc
mc;4.6.2;mc-4.6.2;mc-4.6.2.tar.gz:mc-4.6.2.diff;extract:mc-4.6.2.tar.gz;patch:mc-4.6.2.diff
joe;3.7;joe-3.7;joe-3.7.tar.gz;extract:joe-3.7.tar.gz
bash;4.0;bash-4.0;bash-4.0.tar.gz;extract:bash-4.0.tar.gz
-ccache;3.1.4;ccache-3.1.4;ccache-3.1.4.tar.gz;extract:ccache-3.1.4.tar.gz
+ccache;3.1.9;ccache-3.1.9;ccache-3.1.9.tar.gz;extract:ccache-3.1.9.tar.gz
#
# java
commit 6f085a33febe95f12aacb49988fc96beece6c3c5
Author: GetAway <get...@t-...>
Date: Mon Oct 28 15:41:21 2013 +0100
Kernel: increase tickadj for damn dbox clock
Allows use of additional factor 10 from the original tickadj for
really slow / fast timer
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/Patches/linux-2.4-dbox2.diff b/Patches/linux-2.4-dbox2.diff
index 1d6d604..4f9549c 100644
--- a/Patches/linux-2.4-dbox2.diff
+++ b/Patches/linux-2.4-dbox2.diff
@@ -6074,22 +6074,45 @@ Index: b/kernel/timer.c
===================================================================
--- a/kernel/timer.c
+++ b/kernel/timer.c
-@@ -33,11 +33,14 @@ long tick = (1000000 + HZ/2) / HZ; /* ti
-
- /* The current time */
+@@ -35,7 +35,12 @@ long tick = (1000000 + HZ/2) / HZ; /* ti
struct timeval xtime __attribute__ ((aligned (16)));
/* Don't completely fail for HZ > 500. */
-int tickadj = 500/HZ ? : 1; /* microsecs */
+/* due to the dbox inexact timer, we allow more than
+ 500 microsecs per tick Orignal would correct up to
-+ 0.5%, change it to 2%... */
++ 0.5%, change it to 2%...
++ for really bad timer, we allow factor 10 */
+int tickadj = 2000/HZ ? : 1; /* microsecs */
++long bigadj = 1000000; /* large adjustment */
DECLARE_TASK_QUEUE(tq_timer);
DECLARE_TASK_QUEUE(tq_immediate);
-
- /*
+@@ -487,11 +492,19 @@ static void update_wall_time_one_tick(vo
+ * Limit the amount of the step to be in the range
+ * -tickadj .. +tickadj
+ */
+- if (time_adjust > tickadj)
+- time_adjust_step = tickadj;
+- else if (time_adjust < -tickadj)
+- time_adjust_step = -tickadj;
+-
++ if (time_adjust > tickadj) {
++ if (time_adjust > bigadj)
++ time_adjust_step = 5 * tickadj / 2;
++ else
++ time_adjust_step = tickadj;
++ }
++ else if (time_adjust < -tickadj) {
++ if (time_adjust < -bigadj)
++ time_adjust_step = 5 * -tickadj / 2;
++ else
++ time_adjust_step = -tickadj;
++ }
++
+ /* Reduce by this step the amount of time left */
+ time_adjust -= time_adjust_step;
+ }
diff -uNr linux-2.4.37.11.org//arch/ppc/8xx_io/uart.c linux-2.4.37.11/arch/ppc/8xx_io/uart.c
--- linux-2.4.37.11.org//arch/ppc/8xx_io/uart.c 2010-12-18 16:29:59.000000000 +0100
+++ linux-2.4.37.11/arch/ppc/8xx_io/uart.c 2011-04-27 12:47:55.000000000 +0200
commit ecd43559f5dc54333ff24c7791f5d2d5566112cf
Author: GetAway <get...@t-...>
Date: Thu Oct 31 09:40:04 2013 +0100
version bump ntpd-4.2.6p5
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/Patches/ntp.diff b/Patches/ntp.diff
index ee788ae..b4e5594 100644
--- a/Patches/ntp.diff
+++ b/Patches/ntp.diff
@@ -1,17 +1,3 @@
-diff -uNr ntp-4.2.4p5.org/libisc/ifiter_ioctl.c ntp-4.2.4p5/libisc/ifiter_ioctl.c
---- ntp-4.2.4p5.org/libisc/ifiter_ioctl.c 2006-12-28 13:03:07.000000000 +0100
-+++ ntp-4.2.4p5/libisc/ifiter_ioctl.c 2009-03-13 13:50:02.000000000 +0100
-@@ -482,8 +482,8 @@
- for (i = 0; i < 16; i++) {
- unsigned char byte;
- static const char hex[] = "0123456789abcdef";
-- byte = ((index(hex, address[i * 2]) - hex) << 4) |
-- (index(hex, address[i * 2 + 1]) - hex);
-+ byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
-+ (strchr(hex, address[i * 2 + 1]) - hex);
- addr6.s6_addr[i] = byte;
- }
- iter->current.af = AF_INET6;
diff -uNr ntp-4.2.4p5.org/util/tickadj.c ntp-4.2.4p5/util/tickadj.c
--- ntp-4.2.4p5.org/util/tickadj.c 2004-02-25 06:58:33.000000000 +0100
+++ ntp-4.2.4p5/util/tickadj.c 2009-03-13 13:50:05.000000000 +0100
diff --git a/rules-archive b/rules-archive
index 53ef1fd..219072d 100644
--- a/rules-archive
+++ b/rules-archive
@@ -129,7 +129,7 @@ ncftp-3.2.2-src.tar.bz2;ftp://ftp.ncftp.com/ncftp
screen-4.0.3.tar.gz;ftp://ftp.gnu.org/pub/gnu/screen
links-1.00.tar.gz;http://www.jikos.cz/~mikulas/links//download
links-2.7.tar.bz2;http://links.twibright.com/download
-ntp-4.2.4p5.tar.gz;http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+ntp-4.2.6p5.tar.gz;http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
ntpclient_2000_339.tar.gz;http://doolittle.icarus.com/ntpclient
openntpd-3.9p1.tar.gz;http://ftp-stud.fht-esslingen.de/pub/OpenBSD/OpenNTPD
esound-0.2.41.tar.bz2;ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2
diff --git a/rules-make b/rules-make
index db35887..afa243e 100644
--- a/rules-make
+++ b/rules-make
@@ -121,7 +121,7 @@ ncftp;3.2.2;ncftp-3.2.2;ncftp-3.2.2-src.tar.bz2;extract:ncftp-3.2.2-src.tar.bz2
screen;4.0.3;screen-4.0.3;screen-4.0.3.tar.gz:screen.diff;extract:screen-4.0.3.tar.gz;patch:screen.diff
links;1.0;links-1.00;links-1.00.tar.gz;extract:links-1.00.tar.gz
links_g;2.7;links-2.7;links-2.7.tar.bz2;extract:links-2.7.tar.bz2
-ntpd;4.2.4p5;ntp-4.2.4p5;ntp-4.2.4p5.tar.gz:ntp.diff;extract:ntp-4.2.4p5.tar.gz;patch:ntp.diff
+ntpd;4.2.6p5;ntp-4.2.6p5;ntp-4.2.6p5.tar.gz:ntp.diff;extract:ntp-4.2.6p5.tar.gz;patch:ntp.diff
ntpclient;2000_339;ntpclient;ntpclient_2000_339.tar.gz:ntpclient.diff;extract:ntpclient_2000_339.tar.gz;patch:ntpclient.diff
openntpd;3.9p1;openntpd-3.9p1;openntpd-3.9p1.tar.gz:openntpd-always-use-latest-offset.diff;extract:openntpd-3.9p1.tar.gz;patch:openntpd-always-use-latest-offset.diff
esound;0.2.41;esound-0.2.41;esound-0.2.41.tar.bz2:esound.diff;extract:esound-0.2.41.tar.bz2;patch:esound.diff
-----------------------------------------------------------------------
Summary of changes:
Patches/linux-2.4-dbox2.diff | 35 +++++++++++++++++++++++++++++------
Patches/ntp.diff | 14 --------------
rules-archive | 4 ++--
rules-make | 4 ++--
4 files changed, 33 insertions(+), 24 deletions(-)
--
Tuxbox-GIT: cdk
|
