Skip to content

SUSE spec tweaks#1745

Merged
rleon merged 3 commits into
linux-rdma:masterfrom
nmorey:dev/master/systemd
Jun 9, 2026
Merged

SUSE spec tweaks#1745
rleon merged 3 commits into
linux-rdma:masterfrom
nmorey:dev/master/systemd

Conversation

@nmorey

@nmorey nmorey commented May 28, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@rleon

rleon commented Jun 7, 2026

Copy link
Copy Markdown
Member

@nmorey , there is a need to fix "leap" RPM build failure.

@nmorey nmorey force-pushed the dev/master/systemd branch from b28fadf to 1a50c39 Compare June 7, 2026 17:55
@nmorey

nmorey commented Jun 7, 2026

Copy link
Copy Markdown
Contributor Author

@rleon I bumped the Leap version for the image but I don't think I have the Azure rights to push new images.
Locally it fixes though

@rleon

rleon commented Jun 8, 2026

Copy link
Copy Markdown
Member

I added container, and uploaded it. Please apply this hunk to your first commit and push.


diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml
index be531f809..3a009003a 100644
--- a/buildlib/azure-pipelines.yml
+++ b/buildlib/azure-pipelines.yml
@@ -34,7 +34,7 @@ resources:
       image: ucfconsort.azurecr.io/rdma-core/ubuntu-20.04:44.0
       endpoint: ucfconsort_registry
     - container: leap
-      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:63.0
+      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:64.0
       endpoint: ucfconsort_registry
     - container: i386
       image: ucfconsort.azurecr.io/rdma-core/debian-11-i386:37.0
~
~

nmorey and others added 3 commits June 8, 2026 12:45
Leap 15.0 is more than obsolete.
Use 16.0 to allow the use of new systemd/ldconfig macros

Signed-off-by: Nicolas Morey <nmorey@suse.com>
Some packages are RDMA enabled, but we do not want to always pull
rdma-core as it in turns pull udev/systemd which we do not want for
containerized apps like valkey

Signed-off-by: Dirk Müller <dirk@dmllr.de>
Signed-off-by: Nicolas Morey <nmorey@suse.com>
Drop old-style manual calls to ldconfig and use ldconfig_scriptlets instead

Signed-off-by: Dirk Müller <dirk@dmllr.de>
Signed-off-by: Nicolas Morey <nmorey@suse.com>
@nmorey nmorey force-pushed the dev/master/systemd branch from 1a50c39 to fb62230 Compare June 8, 2026 10:45
@nmorey

nmorey commented Jun 8, 2026

Copy link
Copy Markdown
Contributor Author
-      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:63.0
+      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:64.0

Done.

I wondered at which version to use and found a couple older commit where it used rdma-core .
But seeing as this is intended for stable branch (ie .XXX), 64 makes more sense here.

This doesn't happen often but maybe it's worth writing down the versioning "process" in azure-pipelines.md ?

@rleon rleon merged commit c158c93 into linux-rdma:master Jun 9, 2026
14 checks passed
@rleon

rleon commented Jun 9, 2026

Copy link
Copy Markdown
Member
-      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:63.0
+      image: ucfconsort.azurecr.io/rdma-core/opensuse-16.0:64.0

Done.

I wondered at which version to use and found a couple older commit where it used rdma-core . But seeing as this is intended for stable branch (ie .XXX), 64 makes more sense here.

This doesn't happen often but maybe it's worth writing down the versioning "process" in azure-pipelines.md ?

Probably, yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants