From 470257adfb140f9d6d54d929639ca36b2b66aed8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 05 2021 19:30:53 +0000 Subject: import rshim-2.0.5-2.el8 --- diff --git a/.gitignore b/.gitignore index 9ad14c4..8c1d87e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rshim-2.0.4.tar.gz +SOURCES/rshim-2.0.5.tar.gz diff --git a/.rshim.metadata b/.rshim.metadata index d82efaa..1aa8fd9 100644 --- a/.rshim.metadata +++ b/.rshim.metadata @@ -1 +1 @@ -f98051b246c781b15be5da4e2d49efc2aebf9695 SOURCES/rshim-2.0.4.tar.gz +1e2a3562dac3764b29f101c2ca49711e9728fb04 SOURCES/rshim-2.0.5.tar.gz diff --git a/SOURCES/rshim-sysconfig.patch b/SOURCES/rshim-sysconfig.patch new file mode 100644 index 0000000..17fad3b --- /dev/null +++ b/SOURCES/rshim-sysconfig.patch @@ -0,0 +1,24 @@ +From 37b1523b39d7fb0d58d57b8f58c943055b1e83e2 Mon Sep 17 00:00:00 2001 +From: Jeffrey Bastian +Date: Tue, 6 Apr 2021 14:24:16 -0500 +Subject: [PATCH] add rshim sysconfig file for setting + +--- + rshim.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rshim.service b/rshim.service +index 84f0e2f49eba..7539133f869c 100644 +--- a/rshim.service ++++ b/rshim.service +@@ -9,6 +9,7 @@ After=network.target + [Service] + Restart=always + Type=forking ++EnvironmentFile=-/etc/sysconfig/rshim + ExecStart=-/usr/sbin/rshim $OPTIONS + KillMode=control-group + +-- +2.26.3 + diff --git a/SPECS/rshim.spec b/SPECS/rshim.spec index eb97316..9d93023 100644 --- a/SPECS/rshim.spec +++ b/SPECS/rshim.spec @@ -3,14 +3,15 @@ # Name: rshim -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.0.5 +Release: 2%{?dist} Summary: User-space driver for Mellanox BlueField SoC License: GPLv2 URL: https://github.com/mellanox/rshim-user-space Source0: https://github.com/Mellanox/rshim-user-space/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +Patch0: rshim-sysconfig.patch BuildRequires: gcc, autoconf, automake, make BuildRequires: pkgconfig(libpci), pkgconfig(libusb-1.0), pkgconfig(fuse) @@ -26,7 +27,7 @@ interface. It provides ways to push boot stream, debug the target or login via the virtual console or network interface. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build ./bootstrap.sh @@ -36,6 +37,12 @@ via the virtual console or network interface. %install %make_install +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rshim < - 2.0.5-2 +- Add sysconfig/rshim file and update rshim.service to source it. +- jbastian made the first cut of this patch, which needed to be + modified due to the update to 2.0.5. And I chose to go with + %%autosetup to handle Patch0, instead of sticking with %%setup. +- Resolves: rhbz#1946349 + +* Tue Apr 20 2021 Dean Nelson - 2.0.5-1 +- Update user-space rshim driver source to version 2.0.5. +- Modify rshim.spec accordingly. +- Resolves: rhbz#1950425 + * Tue Jan 26 2021 Dean Nelson - 2.0.4-4 - Expose gating.yaml file in order to enable manual CI gating for rshim in RHEL-8.4, by bumping release and doing a Brew build.