Hello community, here is the log from the commit of package rdma-core for openSUSE:Factory checked in at 2018-08-28 09:23:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdma-core (Old) and /work/SRC/openSUSE:Factory/.rdma-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdma-core" Tue Aug 28 09:23:09 2018 rev:24 rq:630815 version:18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rdma-core/rdma-core.changes 2018-07-02 23:27:44.025673869 +0200 +++ /work/SRC/openSUSE:Factory/.rdma-core.new/rdma-core.changes 2018-08-28 09:23:14.932604180 +0200 @@ -1,0 +2,9 @@ +Thu Aug 2 09:25:16 UTC 2018 - [email protected] + +- Add two patches for rxe_cfg + * suse-Add-recommends-for-rxe_cfg-requirements.patch + adds recommends for the relevant packages + * rxe-switch-to-iproute2-for-rxe_cfg.patch + switches to iproute2 commands + +------------------------------------------------------------------- New: ---- rxe-switch-to-iproute2-for-rxe_cfg.patch suse-Add-recommends-for-rxe_cfg-requirements.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdma-core.spec ++++++ --- /var/tmp/diff_new_pack.RUB0Lj/_old 2018-08-28 09:23:15.424605715 +0200 +++ /var/tmp/diff_new_pack.RUB0Lj/_new 2018-08-28 09:23:15.424605715 +0200 @@ -50,6 +50,8 @@ Source1: baselibs.conf Source2: prebuild-pandoc.sh Source3: prebuilt-pandoc.tgz +Patch0: rxe-switch-to-iproute2-for-rxe_cfg.patch +Patch1: suse-Add-recommends-for-rxe_cfg-requirements.patch BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc @@ -315,6 +317,8 @@ %prep %setup -q -n %{name}-%{version}%{git_ver} +%patch0 +%patch1 #Extract prebuilt pandoc file in the buildlib directory (cd buildlib && tar xf %{S:3}) ++++++ rxe-switch-to-iproute2-for-rxe_cfg.patch ++++++ commit 310719781cf21b656f2bda440b85634c91093f17 Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Wed Aug 1 14:59:43 2018 +0200 rxe: switch to iproute2 for rxe_cfg ifconfig is now deprecated in most distro in favour on iproute2. Drop ifconfig support and use iproute2 Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git debian/control debian/control index 340e8ec96291..2e1c4b835c98 100644 --- debian/control +++ debian/control @@ -29,7 +29,7 @@ Depends: lsb-base (>= 3.2-14~), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Recommends: dmidecode, ethtool, net-tools +Recommends: dmidecode, ethtool, iproute2 Breaks: infiniband-diags (<< 2.0.0) Replaces: infiniband-diags (<< 2.0.0) Description: RDMA core userspace infrastructure and documentation diff --git providers/rxe/rxe_cfg.in providers/rxe/rxe_cfg.in index 0a8583da1860..e3956d82b450 100755 --- providers/rxe/rxe_cfg.in +++ providers/rxe/rxe_cfg.in @@ -189,22 +189,22 @@ sub get_dev_info { $ipv4_addr{$eth} = " "; $eth_mtu{$eth} = ""; - @lines = `ifconfig $eth`; + @lines = `ip addr show $eth`; foreach $line (@lines) { - # get IP address - if ($line =~ /inet addr/) { - $line =~ s/^\s+inet addr://g; - @fields = split(/\s+/, $line); - $ipv4_addr{$eth} = $fields[0]; - } + # get IP address + if ($line =~ /inet /) { + $line =~ s/^\s+inet ([0-9.]+)\//$1 /g; + @fields = split(/\s+/, $line); + $ipv4_addr{$eth} = $fields[0]; + } - # get ethernet mtu - if ($line =~ /MTU:/) { - $line =~ s/^.*MTU://g; - @fields = split(/\s+/, $line); - $eth_mtu{$eth} = $fields[0]; - } - } + # get ethernet mtu + if ($line =~ /mtu /) { + $line =~ s/^.*mtu //g; + @fields = split(/\s+/, $line); + $eth_mtu{$eth} = $fields[0]; + } + } } # get rxe mtu @@ -525,8 +525,8 @@ sub do_start { foreach my $rxe (@rxe_array) { my $stat = get_devinfo($rxe); if ($stat =~ "PORT_DOWN") { - my $cmd = "ifconfig $eth_names{$rxe} up"; - system($cmd); + my $cmd = "ip link set $eth_names{$rxe} up"; + system($cmd); } } ++++++ suse-Add-recommends-for-rxe_cfg-requirements.patch ++++++ commit b48bd3c32dceed87981acf27057b62658b3c5f4c Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Wed Aug 1 15:32:54 2018 +0200 suse: Add recommends for rxe_cfg requirements rxe_cfg requires ethtool and iproute2 or net-tools. net-tools (more precisely ifconfig) being deprecated on all recent SUSE version, recommends iproute2 Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git suse/rdma-core.spec suse/rdma-core.spec index 1df500af58ce..2743596aa6cf 100644 --- suse/rdma-core.spec +++ suse/rdma-core.spec @@ -166,6 +166,9 @@ Obsoletes: librxe-rdmav2 < %{version}-%{release} Requires: %{mlx4_lname} = %{version}-%{release} Requires: %{mlx5_lname} = %{version}-%{release} %endif +# Recommended packages for rxe_cfg +Recommends: ethtool +Recommends: iproute2 %description -n libibverbs libibverbs is a library that allows userspace processes to use RDMA
