Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibsim for openSUSE:Factory checked
in at 2021-09-02 23:20:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibsim (Old)
and /work/SRC/openSUSE:Factory/.ibsim.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibsim"
Thu Sep 2 23:20:27 2021 rev:15 rq:915801 version:0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibsim/ibsim.changes 2021-04-29
01:39:27.630668577 +0200
+++ /work/SRC/openSUSE:Factory/.ibsim.new.1899/ibsim.changes 2021-09-02
23:20:52.256595082 +0200
@@ -1,0 +2,10 @@
+Mon Aug 23 15:12:43 UTC 2021 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- Update to 0.11
+ - Fixes various compilations warnings
+ - Initial NDR support
+ - Remove IsVendorClassSupported capibility bit from HCA
+- Drop patches fixed upstream:
+ - ibsim-fix_type_punning.patch
+ - typo-scrips.patch
+-------------------------------------------------------------------
Old:
----
ibsim-0.10.0.c7e430dc3d9b.tar.gz
ibsim-fix_type_punning.patch
typo-scrips.patch
New:
----
ibsim-0.11.0.4588897b0f42.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibsim.spec ++++++
--- /var/tmp/diff_new_pack.BOB2s0/_old 2021-09-02 23:20:52.780595735 +0200
+++ /var/tmp/diff_new_pack.BOB2s0/_new 2021-09-02 23:20:52.784595741 +0200
@@ -16,19 +16,16 @@
#
-%define git_ver .0.c7e430dc3d9b
+%define git_ver .0.4588897b0f42
Name: ibsim
-Version: 0.10
+Version: 0.11
Release: 0
Summary: InfiniBand fabric simulator for management
License: BSD-2-Clause OR GPL-2.0-only
Group: Productivity/Networking/Diagnostic
Source: ibsim-%{version}%{git_ver}.tar.gz
-Patch1: ibsim-fix_type_punning.patch
-Patch2: ibsim-PIE.patch
-# Backported from upstream
-Patch3: typo-scrips.patch
+Patch1: ibsim-PIE.patch
URL: https://github.com/linux-rdma/ibsim
BuildRequires: infiniband-diags-devel
BuildRequires: libibumad-devel
@@ -41,8 +38,6 @@
%prep
%setup -q -n %{name}-%{version}%{git_ver}
%patch1
-%patch2
-%patch3
%build
export CFLAGS="%{optflags}"
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BOB2s0/_old 2021-09-02 23:20:52.812595775 +0200
+++ /var/tmp/diff_new_pack.BOB2s0/_new 2021-09-02 23:20:52.812595775 +0200
@@ -8,7 +8,7 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">ibsim-(.*)</param>
<param name="versionrewrite-replacement">\1</param>
- <param name="revision">c7e430dc3d9bb677e53a8cd9ca87c5d27d406aa1</param>
+ <param name="revision">4588897b0f42369f05a08ba338d9e16183e09ee7</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*ibsim*.tar</param>
++++++ ibsim-0.10.0.c7e430dc3d9b.tar.gz -> ibsim-0.11.0.4588897b0f42.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/.gitignore
new/ibsim-0.11.0.4588897b0f42/.gitignore
--- old/ibsim-0.10.0.c7e430dc3d9b/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/ibsim-0.11.0.4588897b0f42/.gitignore 2021-06-27 14:06:23.000000000
+0200
@@ -0,0 +1,12 @@
+# Backup files
+*~
+
+# Generated files
+*.o
+*.so
+*.build_profile
+ibsim/ibsim
+ibsim/ibsim-run
+tests/mcast_storm
+tests/query_many
+tests/subnet_discover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/Makefile
new/ibsim-0.11.0.4588897b0f42/Makefile
--- old/ibsim-0.10.0.c7e430dc3d9b/Makefile 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/Makefile 2021-06-27 14:06:23.000000000
+0200
@@ -9,3 +9,18 @@
dist:
./dist.sh RELEASE=$(RELEASE)
+
+distcheck: dist
+ @set -e; set -x; \
+ tarball=`ls -t *.tar.gz | head -n 1`; \
+ rm -rf checkdir; \
+ mkdir checkdir; \
+ cd checkdir; \
+ tar xzf ../$$tarball; \
+ cd *; \
+ make; \
+ make install DESTDIR=`pwd`/root; \
+ #
+ rm -rf checkdir
+
+.PHONEY: all clean dep dist distcheck install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/defs.mk
new/ibsim-0.11.0.4588897b0f42/defs.mk
--- old/ibsim-0.10.0.c7e430dc3d9b/defs.mk 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/defs.mk 2021-06-27 14:06:23.000000000
+0200
@@ -50,7 +50,7 @@
-include .depend
clean:
- $(RM) $(objs) $(libs) $(progs)
+ $(RM) $(objs) $(libs) $(bins) $(extra_clean)
$(RM) .build_profile
$(RM) *.o *.a *.so *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/dist.sh
new/ibsim-0.11.0.4588897b0f42/dist.sh
--- old/ibsim-0.10.0.c7e430dc3d9b/dist.sh 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/dist.sh 2021-06-27 14:06:23.000000000
+0200
@@ -7,11 +7,22 @@
test -z "$RELEASE" || rel=$RELEASE
+dch_entry() {
+ cat <<EOF
+ibsim ($ver) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Tzafrir Cohen <nvi...@cohens.org.il> `date -R`
+
+EOF
+}
+
rm -f $tarball
rm -rf $distdir
mkdir $distdir
-files=`find . -name '*.[ch]' -o -name Makefile`
+files=`find . -name '*.[ch]' -o -name Makefile -o -name '*.in'`
cp -a --parents $files debian \
defs.mk README COPYING TODO net-examples scripts tests $distdir
@@ -19,5 +30,7 @@
| sed -e 's/@VERSION@/'$ver'/' -e 's/@RELEASE@/'$rel'/' -e
's/@TARBALL@/'$tarball'/' \
> $distdir/ibsim.spec
+(dch_entry; cat debian/changelog) >$distdir/debian/changelog
+
tar czf $tarball $distdir
rm -rf $distdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/Makefile
new/ibsim-0.11.0.4588897b0f42/ibsim/Makefile
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/Makefile 2020-10-08
07:31:29.000000000 +0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/Makefile 2021-06-27
14:06:23.000000000 +0200
@@ -1,6 +1,7 @@
bins:=ibsim
scripts:=ibsim-run
-progs:=$(bins) $(scrips)
+progs:=$(bins) $(scripts)
+extra_clean:=ibsim-run
-include ../defs.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/ibsim.c
new/ibsim-0.11.0.4588897b0f42/ibsim/ibsim.c
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/ibsim.c 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/ibsim.c 2021-06-27 14:06:23.000000000
+0200
@@ -55,7 +55,7 @@
#include <ibsim.h>
#include "sim.h"
-#define IBSIM_VERSION "0.10"
+#define IBSIM_VERSION "0.11"
#undef DEBUG
#define PDEBUG if (parsedebug) IBWARN
@@ -338,7 +338,9 @@
static int sim_ctl_set_issm(Client * cl, struct sim_ctl * ctl)
{
- int issm = *(int *)ctl->data;
+ int issm;
+
+ memcpy(&issm, &ctl->data[0], sizeof(int));
VERB("set issm %d port %" PRIx64, issm, cl->port->portguid);
cl->issm = issm;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim.h
new/ibsim-0.11.0.4588897b0f42/ibsim/sim.h
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim.h 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/sim.h 2021-06-27 14:06:23.000000000
+0200
@@ -87,14 +87,22 @@
#define LINKSPEED_SDR_QDR 5
#define LINKSPEED_SDR_DDR_QDR 7
-#define LINKSPEEDEXT_NONE 0
-#define LINKSPEEDEXT_FDR 1
-#define LINKSPEEDEXT_EDR 2
-#define LINKSPEEDEXT_FDR_EDR 3
-#define LINKSPEEDEXT_HDR 4
-#define LINKSPEEDEXT_HDR_FDR 5
-#define LINKSPEEDEXT_HDR_EDR 6
-#define LINKSPEEDEXT_HDR_EDR_FDR 7
+#define LINKSPEEDEXT_NONE 0
+#define LINKSPEEDEXT_FDR 1
+#define LINKSPEEDEXT_EDR 2
+#define LINKSPEEDEXT_FDR_EDR 3
+#define LINKSPEEDEXT_HDR 4
+#define LINKSPEEDEXT_HDR_FDR 5
+#define LINKSPEEDEXT_HDR_EDR 6
+#define LINKSPEEDEXT_HDR_EDR_FDR 7
+#define LINKSPEEDEXT_NDR 8
+#define LINKSPEEDEXT_NDR_FDR 9
+#define LINKSPEEDEXT_NDR_EDR 10
+#define LINKSPEEDEXT_NDR_FDR_EDR 11
+#define LINKSPEEDEXT_NDR_HDR 12
+#define LINKSPEEDEXT_NDR_HDR_FDR 13
+#define LINKSPEEDEXT_NDR_HDR_EDR 14
+#define LINKSPEEDEXT_NDR_HDR_EDR_FDR 15
#define MLNXLINKSPEED_NONE 0
#define MLNXLINKSPEED_FDR10 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_cmd.c
new/ibsim-0.11.0.4588897b0f42/ibsim/sim_cmd.c
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_cmd.c 2020-10-08
07:31:29.000000000 +0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/sim_cmd.c 2021-06-27
14:06:23.000000000 +0200
@@ -72,7 +72,7 @@
};
static const char *portlinkspeedext[] = {
- "0", " 14G", " 25G", "-", "50G",
+ "0", " 14G", " 25G", "-", "50G", "-", "-", "-", "100G",
};
static const char *portlinkmlnxspeed[] = {
@@ -82,8 +82,8 @@
#define PORTSTATE(i) (((i) < 1 || (i) > 4) ? "?" : portstates[(i)])
#define PHYSSTATE(i) (((i) < 1 || (i) > 6) ? "?" : physstates[(i)])
#define PORTLINKWIDTH(i) (((i) < 1 || (i) > 16) ? "?" : portlinkwidth[(i)])
-#define PORTLINKSPEED(i) (((i) < 1 || (i) > 4) ? "?" : portlinkspeed[(i)])
-#define PORTLINKSPEEDEXT(i) (((i) < 0 || (i) > 4) ? "?" :
portlinkspeedext[(i)])
+#define PORTLINKSPEED(i) (((i) < 1 || (i) > 8) ? "?" : portlinkspeed[(i)])
+#define PORTLINKSPEEDEXT(i) (((i) < 0 || (i) > 8) ? "?" :
portlinkspeedext[(i)])
#define PORTMLNXLINKSPEED(i) (((i) < 0 || (i) > 1) ? "?" :
portlinkmlnxspeed[(i)])
static int do_link(FILE * f, char *line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_mad.c
new/ibsim-0.11.0.4588897b0f42/ibsim/sim_mad.c
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_mad.c 2020-10-08
07:31:29.000000000 +0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/sim_mad.c 2021-06-27
14:06:23.000000000 +0200
@@ -603,6 +603,19 @@
p->linkspeedext = LINKSPEEDEXT_HDR;
rp->linkspeedext = LINKSPEEDEXT_HDR;
break;
+
+ case LINKSPEEDEXT_NDR:
+ case LINKSPEEDEXT_NDR_FDR:
+ case LINKSPEEDEXT_NDR_EDR:
+ case LINKSPEEDEXT_NDR_FDR_EDR:
+ case LINKSPEEDEXT_NDR_HDR:
+ case LINKSPEEDEXT_NDR_HDR_FDR:
+ case LINKSPEEDEXT_NDR_HDR_EDR:
+ case LINKSPEEDEXT_NDR_HDR_EDR_FDR:
+ p->linkspeedext = LINKSPEEDEXT_NDR;
+ rp->linkspeedext = LINKSPEEDEXT_NDR;
+ break;
+
default:
espeed = 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_net.c
new/ibsim-0.11.0.4588897b0f42/ibsim/sim_net.c
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim/sim_net.c 2020-10-08
07:31:29.000000000 +0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim/sim_net.c 2021-06-27
14:06:23.000000000 +0200
@@ -65,6 +65,7 @@
#define LINKSPEED_STR_FDR "FDR"
#define LINKSPEED_STR_EDR "EDR"
#define LINKSPEED_STR_HDR "HDR"
+#define LINKSPEED_STR_NDR "NDR"
#define LINKSPEED_STR_FDR10 "FDR10"
static int inclines[MAX_INCLUDE];
@@ -109,7 +110,7 @@
static const uint8_t hcaport[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x02, 0x00, 0x01, 0x00, 0x50, 0xC0, 0x48,
+ 0x00, 0x02, 0x00, 0x01, 0x00, 0x40, 0xC0, 0x48,
0x00, 0x00, 0x0F, 0xF9, 0x01, 0x03, 0x03, 0x02,
0x12, 0x52, 0x00, 0x11, 0x40, 0x40, 0x00, 0x08,
0x08, 0x04, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00,
@@ -500,10 +501,13 @@
port->linkspeedena = LINKSPEED_QDR | LINKSPEED_SDR |
LINKSPEED_DDR;
port->mlnx_linkspeedena = MLNXLINKSPEED_FDR10;
} else if (!strncmp(speed, LINKSPEED_STR_HDR, strlen(speed))) {
-
port->linkspeedextena = LINKSPEEDEXT_HDR_EDR_FDR;
port->linkspeedena = LINKSPEED_QDR | LINKSPEED_SDR |
LINKSPEED_DDR;
port->mlnx_linkspeedena = MLNXLINKSPEED_FDR10;
+ } else if (!strncmp(speed, LINKSPEED_STR_NDR, strlen(speed))) {
+ port->linkspeedextena = LINKSPEEDEXT_NDR_HDR_EDR_FDR;
+ port->linkspeedena = LINKSPEED_QDR | LINKSPEED_SDR |
LINKSPEED_DDR;
+ port->mlnx_linkspeedena = MLNXLINKSPEED_FDR10;
} else if (!strncmp(speed, LINKSPEED_STR_FDR10, strlen(speed))){
port->linkspeedena = LINKSPEED_QDR | LINKSPEED_SDR |
LINKSPEED_DDR;
port->mlnx_linkspeedena = MLNXLINKSPEED_FDR10;
@@ -1225,6 +1229,8 @@
{
int speed = lport->linkspeedextena & rport->linkspeedextena;
+ if (speed & LINKSPEEDEXT_NDR)
+ return LINKSPEEDEXT_NDR;
if (speed & LINKSPEEDEXT_HDR)
return LINKSPEEDEXT_HDR;
if (speed & LINKSPEEDEXT_EDR)
@@ -1281,7 +1287,7 @@
if (p->linkspeedext) {
mad_set_field(pi, 0, IB_PORT_LINK_SPEED_EXT_ENABLED_F,
p->linkspeedextena);
- mad_set_field(pi, 0, IB_PORT_LINK_SPEED_EXT_SUPPORTED_F,
LINKSPEEDEXT_HDR_EDR_FDR);
+ mad_set_field(pi, 0, IB_PORT_LINK_SPEED_EXT_SUPPORTED_F,
LINKSPEEDEXT_NDR_HDR_EDR_FDR);
mad_set_field(pi, 0, IB_PORT_LINK_SPEED_EXT_ACTIVE_F,
p->linkspeedext);
} else {
mad_set_field(pi, 0, IB_PORT_LINK_SPEED_EXT_ENABLED_F, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/ibsim.spec.in
new/ibsim-0.11.0.4588897b0f42/ibsim.spec.in
--- old/ibsim-0.10.0.c7e430dc3d9b/ibsim.spec.in 2020-10-08 07:31:29.000000000
+0200
+++ new/ibsim-0.11.0.4588897b0f42/ibsim.spec.in 2021-06-27 14:06:23.000000000
+0200
@@ -37,6 +37,7 @@
%defattr(-,root,root)
%{_libdir}/umad2sim/libumad2sim*.so*
%{_bindir}/ibsim
+%{_bindir}/ibsim-run
%doc README COPYING TODO net-examples scripts
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ibsim-0.10.0.c7e430dc3d9b/umad2sim/umad2sim.c
new/ibsim-0.11.0.4588897b0f42/umad2sim/umad2sim.c
--- old/ibsim-0.10.0.c7e430dc3d9b/umad2sim/umad2sim.c 2020-10-08
07:31:29.000000000 +0200
+++ new/ibsim-0.11.0.4588897b0f42/umad2sim/umad2sim.c 2021-06-27
14:06:23.000000000 +0200
@@ -732,6 +732,8 @@
str = " EDR";
else if (speed == 4)
str = " HDR";
+ else if (speed == 8)
+ str = " NDR";
else
str = "";
file_printf(path, SYS_PORT_RATE, "%d Gb/sec (%dX%s)\n",
