[Pkg-openmpi-maintainers] Bug#666110: pvbatch / openmpi refuses under chroot

[Michael Banck]

Hi,

On Wed, May 02, 2012 at 01:15:46PM +0200, Michael Banck wrote:
> On Thu, Apr 19, 2012 at 12:27:43AM +0200, Michael Banck wrote:
> > I could NMU the current unstable version with the patch if you agree.
> 
> I have just uploaded an NMU to DELAYED/3-day.  Let me know if I should
> move it to 0-day. Debdiff attached.

As the upload got rejected due to a lintian error, I have uploaded a
new package overriding that error and filed a bug (#671621) for it.  New
debdiff attached.


Cheers,

Michael
-------------- next part --------------
diff -u openmpi-1.4.3/debian/rules openmpi-1.4.3/debian/rules
--- openmpi-1.4.3/debian/rules
+++ openmpi-1.4.3/debian/rules
@@ -175,6 +175,7 @@
 	dh_installdocs --all AUTHORS NEWS README
 	dh_installexamples -a
 	dh_installman -a
+	dh_lintian
 	dh_link -a
 	dh_strip -a --dbg-package=libopenmpi-dbg
 	dh_compress  -a
diff -u openmpi-1.4.3/debian/changelog openmpi-1.4.3/debian/changelog
--- openmpi-1.4.3/debian/changelog
+++ openmpi-1.4.3/debian/changelog
@@ -1,3 +1,14 @@
+openmpi (1.4.3-2.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * debian/patches/arm_support: fix ARM timer code, by Leif Lindholm. 
+    Closes: #666110.
+  * debian/libopenmpi1.3.lintian-overrides: New file, override
+    "embedded-library" lintian error, see #671621.
+  * debian/rules: Add dh_lintian.
+
+ -- Michael Banck <mbanck at debian.org>  Sat, 05 May 2012 17:02:38 +0200
+
 openmpi (1.4.3-2.1) unstable; urgency=low
 
   * Non-maintainer upload
diff -u openmpi-1.4.3/debian/patches/arm_support openmpi-1.4.3/debian/patches/arm_support
--- openmpi-1.4.3/debian/patches/arm_support
+++ openmpi-1.4.3/debian/patches/arm_support
@@ -255,7 +255,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ openmpi-1.4.3/opal/include/opal/sys/arm/timer.h	2011-01-06 14:49:50.000000000 +0200
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 + *                         University Research and Technology
@@ -279,12 +279,20 @@
 +
 +#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1
 +
++#include <sys/times.h>
++
 +typedef uint64_t opal_timer_t;
 +
 +static inline opal_timer_t
 +opal_sys_timer_get_cycles(void)
 +{
-+    return 0;
++    opal_timer_t ret;
++    struct tms accurate_clock;
++
++    times(&accurate_clock);
++    ret = accurate_clock.tms_utime + accurate_clock.tms_stime;
++
++    return ret;
 +}
 +
 +#endif /* ! OMPI_SYS_ARCH_TIMER_H */
only in patch2:
unchanged:
--- openmpi-1.4.3.orig/debian/libopenmpi1.3.lintian-overrides
+++ openmpi-1.4.3/debian/libopenmpi1.3.lintian-overrides
@@ -0,0 +1 @@
+libopenmpi1.3: embedded-library usr/lib/openmpi/lib/libopen-pal.so.0.0.0: ltdl