Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rshim for openSUSE:Factory checked in at 2026-07-09 22:21:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rshim (Old) and /work/SRC/openSUSE:Factory/.rshim.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rshim" Thu Jul 9 22:21:00 2026 rev:2 rq:1364692 version:2.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/rshim/rshim.changes 2026-06-05 15:00:28.332733283 +0200 +++ /work/SRC/openSUSE:Factory/.rshim.new.1991/rshim.changes 2026-07-09 22:22:11.199872514 +0200 @@ -1,0 +2,11 @@ +Sun Jun 28 15:04:17 UTC 2026 - Dirk Müller <[email protected]> + +- update to 2.7.3: + * bfb-tool: preserve original filename in repack for + --all/--opn modes + * rpm: simplify selinux overlay handling + * Update rshim.c to fix high contention of rshim_fd_mutex + + SIGINT not being handle + * bfb-install: remove "finished" as exit condition + +------------------------------------------------------------------- @@ -5,0 +17 @@ +- add configure-add-with-systemdutildir-option-for-network.patch @@ -10,0 +23 @@ +- add shebang.patch Old: ---- rshim-2.7.1.tar.gz New: ---- rshim-2.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rshim.spec ++++++ --- /var/tmp/diff_new_pack.1a0aOM/_old 2026-07-09 22:22:11.831894236 +0200 +++ /var/tmp/diff_new_pack.1a0aOM/_new 2026-07-09 22:22:11.831894236 +0200 @@ -1,7 +1,7 @@ # # spec file for package rshim # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2019 Mellanox Technologies. All Rights Reserved. # Copyright (c) 2025 Andreas Stieger <[email protected]> # @@ -19,7 +19,7 @@ Name: rshim -Version: 2.7.1 +Version: 2.7.3 Release: 0 Summary: User-space driver for Mellanox BlueField SoC License: BSD-3-Clause OR GPL-2.0-only @@ -31,10 +31,10 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig +BuildRequires: systemd-networkd BuildRequires: pkgconfig(fuse3) BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: systemd-networkd ExcludeArch: %{ix86} armv6l armv6hl armv7l armv7hl %description ++++++ rshim-2.7.1.tar.gz -> rshim-2.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/configure.ac new/rshim-user-space-rshim-2.7.3/configure.ac --- old/rshim-user-space-rshim-2.7.1/configure.ac 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/configure.ac 2026-05-05 15:48:06.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (C) 2019 Mellanox Technologies. All Rights Reserved. # -AC_INIT([rshim], [2.7.1]) +AC_INIT([rshim], [2.7.3]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_LANG(C) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/debian/changelog new/rshim-user-space-rshim-2.7.3/debian/changelog --- old/rshim-user-space-rshim-2.7.1/debian/changelog 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/debian/changelog 2026-05-05 15:48:06.000000000 +0200 @@ -1,3 +1,17 @@ +rshim (2.7.3) UNRELEASED; urgency=low + + * bfb-tool: preserve original filename in repack for --all/--opn modes + + -- Penghe Geng <[email protected]> Tue, 05 May 2026 09:27:12 -0400 + +rshim (2.7.2) UNRELEASED; urgency=low + + * rpm: simplify selinux overlay handling + * Update rshim.c to fix high contention of rshim_fd_mutex + SIGINT not being handle + * bfb-install: remove "finished" as exit condition + + -- Penghe Geng <[email protected]> Mon, 20 Apr 2026 13:48:08 -0400 + rshim (2.7.1) UNRELEASED; urgency=low * Some robust fixes for USB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/rhel/rshim.spec.in new/rshim-user-space-rshim-2.7.3/rhel/rshim.spec.in --- old/rshim-user-space-rshim-2.7.1/rhel/rshim.spec.in 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/rhel/rshim.spec.in 2026-05-05 15:48:06.000000000 +0200 @@ -68,6 +68,14 @@ %endif %changelog +* Tue May 05 2026 Penghe Geng <[email protected]> - 2.7.3 +- bfb-tool: preserve original filename in repack for --all/--opn modes + +* Mon Apr 20 2026 Penghe Geng <[email protected]> - 2.7.2 +- rpm: simplify selinux overlay handling +- Update rshim.c to fix high contention of rshim_fd_mutex + SIGINT not being handle +- bfb-install: remove "finished" as exit condition + * Fri Mar 06 2026 Penghe Geng <[email protected]> - 2.7.1 - Some robust fixes for USB - Avoid rshim1 on DPU-BMC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/rshim.spec.in new/rshim-user-space-rshim-2.7.3/rshim.spec.in --- old/rshim-user-space-rshim-2.7.1/rshim.spec.in 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/rshim.spec.in 2026-05-05 15:48:06.000000000 +0200 @@ -89,16 +89,44 @@ RHEL_MINOR=$(echo $VERSION_ID | cut -d '.' -f 2) if [ "$RHEL_MAJOR" -gt 9 ] || \ { [ "$RHEL_MAJOR" -eq 9 ] && [ "$RHEL_MINOR" -ge 5 ]; }; then - polver=$(grep "^module" %{_datadir}/selinux/packages/rshim-fix.te | sed 's/;//' | awk '{print $3}') - echo "Applying SELinux rshim policy fix $polver for RHEL 9.5..." - if [ -x /usr/bin/checkmodule ] && [ -x /usr/bin/semodule_package ]; then - mkdir -p /tmp/rshim-selinux - checkmodule -M -m -o /tmp/rshim-selinux/rshim-fix.mod %{_datadir}/selinux/packages/rshim-fix.te - semodule_package -o /tmp/rshim-selinux/rshim-fix.pp -m /tmp/rshim-selinux/rshim-fix.mod - semodule -i /tmp/rshim-selinux/rshim-fix.pp || : - rm -rf /tmp/rshim-selinux - else - echo "SELinux policy tools are not available. rshim policy update failed." + selinux_enabled=0 + if command -v getenforce >/dev/null 2>&1; then + case "$(getenforce 2>/dev/null || true)" in + Enforcing|Permissive) + selinux_enabled=1 + ;; + esac + elif [ -d /sys/fs/selinux ]; then + selinux_enabled=1 + fi + if [ "$selinux_enabled" -ne 0 ]; then + if [ -n "${VERSION_ID:-}" ]; then + os_name="${NAME:-RHEL} ${VERSION_ID}" + else + os_name="${NAME:-RHEL}" + fi + tmpdir=/tmp/rshim-selinux + echo "Applying SELinux rshim policy fix on $os_name..." + mkdir -p "$tmpdir" + if command -v checkmodule >/dev/null 2>&1 && + command -v semodule_package >/dev/null 2>&1 && + command -v semodule >/dev/null 2>&1 && + checkmodule -M -m -o "$tmpdir/rshim-fix.mod" %{_datadir}/selinux/packages/rshim-fix.te && + semodule_package -o "$tmpdir/rshim-fix.pp" -m "$tmpdir/rshim-fix.mod" && + semodule -i "$tmpdir/rshim-fix.pp"; then + echo "Installed SELinux rshim policy fix." + else + rm -rf "$tmpdir" + echo "Error: failed to apply SELinux rshim policy fix." + echo \ + "This may be caused by missing SELinux tools or a host SELinux" \ + "policy conflict, not by rshim rpm itself." + echo \ + "Reinstalling the host SELinux policy packages or cleaning up" \ + "stale SELinux modules may help." + exit 1 + fi + rm -rf "$tmpdir" fi fi else @@ -154,6 +182,14 @@ %{_datadir}/selinux/packages/rshim-fix.te %changelog +* Tue May 05 2026 Penghe Geng <[email protected]> - 2.7.3 +- bfb-tool: preserve original filename in repack for --all/--opn modes + +* Mon Apr 20 2026 Penghe Geng <[email protected]> - 2.7.2 +- rpm: simplify selinux overlay handling +- Update rshim.c to fix high contention of rshim_fd_mutex + SIGINT not being handle +- bfb-install: remove "finished" as exit condition + * Fri Mar 06 2026 Penghe Geng <[email protected]> - 2.7.1 - Some robust fixes for USB - Avoid rshim1 on DPU-BMC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/scripts/bfb-install new/rshim-user-space-rshim-2.7.3/scripts/bfb-install --- old/rshim-user-space-rshim-2.7.1/scripts/bfb-install 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/scripts/bfb-install 2026-05-05 15:48:06.000000000 +0200 @@ -461,7 +461,7 @@ # the exit condition of the bfb-install script. local filter0 filter - filter0="Rebooting\.\.\.|finished|DPU is ready|Linux up|CRITICAL ERROR" + filter0="Rebooting\.\.\.|DPU is ready|Linux up|CRITICAL ERROR" if [ $deferred -eq 0 ]; then filter0="$filter0|In Enhanced NIC mode" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/scripts/bfb-tool new/rshim-user-space-rshim-2.7.3/scripts/bfb-tool --- old/rshim-user-space-rshim-2.7.1/scripts/bfb-tool 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/scripts/bfb-tool 2026-05-05 15:48:06.000000000 +0200 @@ -1058,10 +1058,14 @@ target_bfb=${OUTPUT_BFB} else target_bfb=${bfb##*/} - if [ "$OUTPUT_FORMAT" == "bundle" ]; then + # Append OPN to filename only when the directory uses PSID, + # since the OPN is not captured in the directory path. + # In --all/--opn modes the OPN is already in the directory. + if [ $BUILD_ALL -eq 0 ] && [ "$ID_SET" == "PSID" ]; then target_bfb=${target_bfb/.bfb/-${OPN}.bfb} - else - target_bfb=${target_bfb/.bfb/-${OPN}.flat.bfb} + fi + if [ "$OUTPUT_FORMAT" != "bundle" ]; then + target_bfb=${target_bfb/.bfb/.flat.bfb} fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-user-space-rshim-2.7.1/src/rshim.c new/rshim-user-space-rshim-2.7.3/src/rshim.c --- old/rshim-user-space-rshim-2.7.1/src/rshim.c 2026-03-06 22:39:31.000000000 +0100 +++ new/rshim-user-space-rshim-2.7.3/src/rshim.c 2026-05-05 15:48:06.000000000 +0200 @@ -353,10 +353,18 @@ update = false; } - if (update) - rshim_fd_full_write(rshim_work_fd[1], &index, sizeof(index)); + if (update) { + /* + * Write directly to the work pipe without holding rshim_fd_mutex. + * Pipe writes of 1 byte are atomic; concurrent read (epoll) and write + * are safe. This avoids blocking the epoll loop (which would cause + * read misc timeouts) and avoids lock contention during boot install + * (which would double installation time). + */ + ssize_t n = write(rshim_work_fd[1], &index, sizeof(index)); + (void)n; /* Best-effort; epoll will still wake on future signals */ + } } - /* * Read some bytes from RShim. * @@ -3285,6 +3293,7 @@ rshim_sig_hup(sig); break; + case SIGINT: case SIGTERM: rshim_run = false; __sync_synchronize();
