tags 359018 + patch thanks Attached is the patch used for the NMU of the new upstream version.
It includes a patch to revert the changes between 1.4.10 and 1.4.11 in second/timer.c which caused a regression seen on Ultra 10 where the system would no longer automatically boot after the timeout set in silo.conf [1]. [1] http://marc.theaimsgroup.com/?l=linux-sparc&m=114472043429583&w=2
diff -Nru /tmp/SwQGwn4AFo/silo-1.4.10/debian/changelog /tmp/929UAM3UQ1/silo-1.4.11/debian/changelog
--- /tmp/SwQGwn4AFo/silo-1.4.10/debian/changelog 2006-01-25 15:24:14.000000000 +0100
+++ /tmp/929UAM3UQ1/silo-1.4.11/debian/changelog 2006-04-14 02:50:42.000000000 +0200
@@ -1,6 +1,17 @@
+silo (1.4.11-0.1) unstable; urgency=low
+
+ * Non-Maintainer Upload. Closes: #359018.
+ - New upstream release.
+ - Include patch to restore second/timer.c from 1.4.10 to avoid regression
+ seen on Ultra 10 where the system would no longer boot automatically
+ after expiration of the timeout set in silo.conf.
+ - Use debian/compat instead of setting debhelper compatibility in rules.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Fri, 14 Apr 2006 02:40:43 +0200
+
silo (1.4.10-0.1) unstable; urgency=low
- * Non Maintainer Upload.
+ * Non-Maintainer Upload.
* New upstream release. Closes: #306012, #349788.
* Update debconf compatibility level to 5.
* Fix lintian warning for "multiline-field build-depends".
diff -Nru /tmp/SwQGwn4AFo/silo-1.4.10/debian/compat /tmp/929UAM3UQ1/silo-1.4.11/debian/compat
--- /tmp/SwQGwn4AFo/silo-1.4.10/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/929UAM3UQ1/silo-1.4.11/debian/compat 2006-03-25 23:13:56.000000000 +0100
@@ -0,0 +1 @@
+5
diff -Nru /tmp/SwQGwn4AFo/silo-1.4.10/debian/patches/10-sun4u_notimer.patch /tmp/929UAM3UQ1/silo-1.4.11/debian/patches/10-sun4u_notimer.patch
--- /tmp/SwQGwn4AFo/silo-1.4.10/debian/patches/10-sun4u_notimer.patch 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/929UAM3UQ1/silo-1.4.11/debian/patches/10-sun4u_notimer.patch 2006-04-14 02:36:47.000000000 +0200
@@ -0,0 +1,42 @@
+--- silo-1.4.11/second/timer.c 2006-03-08 19:41:35.000000000 +0100
++++ silo-1.4.10/second/timer.c 2001-08-10 05:50:27.000000000 +0200
+@@ -40,6 +40,8 @@
+ static volatile struct sun4c_timer_info *sun4c_timer;
+ static unsigned char *addr_to_free = 0;
+ static int len_to_free;
++static unsigned long long sun4u_tickcmpr;
++static int sun4u_notimer = 0;
+ static struct mostek48t02 *mregs;
+ static long clock_frequency;
+
+@@ -154,6 +156,16 @@
+ }
+ if (!foundcpu || !clock_frequency)
+ clock_frequency = prom_getint(prom_root_node, "clock-frequency") / 100;
++ if (notimer) {
++ sun4u_notimer = 1;
++ __asm__ __volatile__ ("\t"
++ "rd %%tick_cmpr, %%g1\n\t"
++ "stx %%g1, [%0]\n\t"
++ "mov 1, %%g1\n\t"
++ "sllx %%g1, 63, %%g1\n\t"
++ "wr %%g1, 0, %%tick_cmpr"
++ : : "r" (&sun4u_tickcmpr) : "g1");
++ }
+ return 0;
+ }
+
+@@ -194,6 +206,13 @@
+
+ void close_timer ()
+ {
++ if (sun4u_notimer) {
++ __asm__ __volatile__("\t"
++ "ldx [%0], %%g1\n\t"
++ "wrpr %%g0, 0, %%tick\n\t"
++ "wr %%g1, 0, %%tick_cmpr"
++ : : "r" (&sun4u_tickcmpr) : "g1");
++ }
+ if (addr_to_free) {
+ if (addr_to_free == (unsigned char *)0xffffffff)
+ sun4c_unmapio (TICKER_VIRTUAL);
diff -Nru /tmp/SwQGwn4AFo/silo-1.4.10/debian/rules /tmp/929UAM3UQ1/silo-1.4.11/debian/rules
--- /tmp/SwQGwn4AFo/silo-1.4.10/debian/rules 2006-01-19 15:44:08.000000000 +0100
+++ /tmp/929UAM3UQ1/silo-1.4.11/debian/rules 2006-03-25 23:13:42.000000000 +0100
@@ -1,9 +1,7 @@
#!/usr/bin/make -f
-export DH_COMPAT=5
-
# the dbs rules
-TAR_DIR := silo-1.4.10
+TAR_DIR := silo-1.4.11
include debian/scripts/dbs-build.mk
CC = "gcc-2.95 -m32"
pgp7wJT3QtnDF.pgp
Description: PGP signature
