3 Commits

Author SHA256 Message Date
9e7bfc85e2 drbd: sync factory SR 1327106 and 1318578
https://build.opensuse.org/request/show/1327106
- drbd-selinux: change arch from x86_64 to noarch
  * Update drbd-utils.spec:  add "BuildArch: noarch"

https://build.opensuse.org/requests/1318578
- Update SELinux module dir as macro to allow root path move from /var/lib/selinux
  to /etc/selinux (bsc#1221342)

update bsc-1233273-1252991_drbd.ocf-update-for-OCF-1.1.patch
- sync with facotry, update commit log subject only (no code change)
2026-01-15 10:35:47 +08:00
Su Yue
7559ade8ad sync OBS request 1318531 and 1318206 from network:ha-clustering:Factory
https://build.opensuse.org/requests/1318531
- [SELinux] nfs_drbd: "fence-peer helper broken, returned 0" and nfs WRITE hang when power off the secondary node (bsc#1252991)
  * Update and rename patch
    - bsc-1233273_drbd.ocf-update-for-OCF-1.1.patch
    + bsc-1233273-1252991_drbd.ocf-update-for-OCF-1.1.patch

https://build.opensuse.org/request/show/1318206
- Allow domtrans from kernel_t to drbd_t (bsc#1252991)
  * add patch
    - 1252991-selinux-domtrans-from-kernel.patch

Signed-off-by: Su Yue <glass.su@suse.com>
2025-11-19 12:05:23 +08:00
d55ea56963 drbd: sync factory changes for fixing bsc#1247534
drbd_passive didn't start due to drbd.rules returning error (bsc#1247534)
- add patch:
   bsc-1247534_drbd-didnt-start-due-to-drbd_rules-returning-err.patch
- remove patch:
   bsc-1239437_drbd.rules-fix-missing-udev-device.patch

Signed-off-by: Heming Zhao <heming.zhao@suse.com>
2025-10-14 15:44:16 +08:00
3 changed files with 0 additions and 62 deletions

View File

@@ -1,54 +0,0 @@
From e826915c83bf93cb13aebf0ff61477787ccbf55b Mon Sep 17 00:00:00 2001
From: Su Yue <glass.su@suse.com>
Date: Tue, 27 Jan 2026 12:41:06 +0800
Subject: [PATCH] drbdmon: remove unused variables to fix gcc16 errors
drbd-utils doesn't build with GCC 16:
[ 38s] terminal/MDspTaskDetail.cpp: In member function virtual void MDspTaskDetail::display_content():
[ 38s] terminal/MDspTaskDetail.cpp:263:22: error: variable skip_ctr set but not used [-Werror=unused-but-set-variable=]
[ 38s] 263 | uint32_t skip_ctr = 0;
[ 38s] | ^~~~~~~~
[ 38s] terminal/MDspTaskDetail.cpp:277:22: error: variable print_ctr set but not used [-Werror=unused-but-set-variable=]
[ 38s] 277 | uint32_t print_ctr = 0;
[ 38s] | ^~~~~~~~~
[ 38s] cc1plus: all warnings being treated as errors
Starting with GCC 16, var pre/postincrements and var @= expr no longer count as uses at some warning levels.
skip_ctr and print_ctr are set but not used so remove them to fix errors.
Signed-off-by: Su Yue <glass.su@suse.com>
---
user/drbdmon/terminal/MDspTaskDetail.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/user/drbdmon/terminal/MDspTaskDetail.cpp b/user/drbdmon/terminal/MDspTaskDetail.cpp
index bab08eae6775..edfcf981f7a2 100644
--- a/user/drbdmon/terminal/MDspTaskDetail.cpp
+++ b/user/drbdmon/terminal/MDspTaskDetail.cpp
@@ -260,10 +260,8 @@ void MDspTaskDetail::display_content()
uint32_t page_ctr = 1;
uint32_t page_line_ctr = first_page_lines;
format_text.restart();
- uint32_t skip_ctr = 0;
while (page_ctr < page_nr && format_text.skip_line())
{
- ++skip_ctr;
++page_line_ctr;
if (page_line_ctr >= lines_per_page)
{
@@ -274,10 +272,8 @@ void MDspTaskDetail::display_content()
std::string line;
uint32_t line_ctr = page_nr == 1 ? line_offset : 0;
- uint32_t print_ctr = 0;
while (format_text.next_line(line, dsp_comp_hub.active_color_table->rst) && line_ctr < lines_per_page)
{
- ++print_ctr;
dsp_comp_hub.dsp_io->cursor_xy(1, current_line);
dsp_comp_hub.dsp_io->write_text(line.c_str());
++current_line;
--
2.50.1 (Apple Git-155)

View File

@@ -1,10 +1,3 @@
-------------------------------------------------------------------
Tue Jan 27 04:52:30 UTC 2026 - Glass Su <glass.su@suse.com>
- Package drbd-utils doesn't build with GCC 16 (bsc#1256961)
* Add patch
+ bsc-1256961_drbdmon-remove-unused-variables-to-fix-gcc16-errors.patch
-------------------------------------------------------------------
Tue Jan 13 11:47:08 UTC 2026 - heming zhao <heming.zhao@suse.com>

View File

@@ -76,7 +76,6 @@ Patch1007: bsc-1233273-1252991_drbd.ocf-update-for-OCF-1.1.patch
Patch1008: rpmlint-build-error.patch
Patch1009: bsc-1247534_drbd-didnt-start-due-to-drbd_rules-returning-err.patch
Patch1010: 1252991-selinux-domtrans-from-kernel.patch
Patch1011: bsc-1256961_drbdmon-remove-unused-variables-to-fix-gcc16-errors.patch
#############################################
Provides: drbd-bash-completion = %{version}