diff --git a/base/stalld/PKG-INFO b/base/stalld/PKG-INFO index 504dab504..0121a6a86 100644 --- a/base/stalld/PKG-INFO +++ b/base/stalld/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: stalld -Version: 1.19.6 +Version: 1.19.8 Summary: stall daemon Home-page: https://gitlab.com/rt-linux-tools/stalld Author: RedHat diff --git a/base/stalld/debian/deb_folder/changelog b/base/stalld/debian/deb_folder/changelog index 86ca4aed0..96e19d117 100644 --- a/base/stalld/debian/deb_folder/changelog +++ b/base/stalld/debian/deb_folder/changelog @@ -1,5 +1,6 @@ -stalld (1.19.6) UNRELEASED; urgency=low +stalld (1.19.8) unstable; urgency=low - * Initial patching of debian package + * Patch updated version of stalld to v1.19.8 + * Initial patching of debian package v1.19.6 - Eliud Kyale Wed, 11 Dec 2024 00:00:00 +0000 + -- Eliud Kyale Tue, 27 May 2025 00:00:00 +0000 diff --git a/base/stalld/debian/meta_data.yaml b/base/stalld/debian/meta_data.yaml index 379aa9859..1ea131f6f 100644 --- a/base/stalld/debian/meta_data.yaml +++ b/base/stalld/debian/meta_data.yaml @@ -1,10 +1,11 @@ --- debname: stalld -debver: 1.19.6 +debver: 1.19.8 dl_path: - name: stalld-v1.19.6.tar.gz - url: https://gitlab.com/rt-linux-tools/stalld/-/archive/v1.19.6/stalld-v1.19.6.tar.gz - sha256sum: a185756f5d4ea239120322aa8b4f2a37c76653e41295f69e7eb37dcd26313bd0 + name: stalld-v1.19.8.tar.gz + url: https://gitlab.com/rt-linux-tools/stalld/-/archive/v1.19.8/stalld-v1.19.8.tar.gz + sha256sum: be84f4c9560e77807c8b45e5ddbb9d02d80c591c6224d3c2b16525ce834c79a7 + revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch b/base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch index 87ea853e0..a0561202d 100644 --- a/base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch +++ b/base/stalld/debian/patches/0001-Build-and-compatibility-for-StarlingX.patch @@ -1,54 +1,44 @@ -From f0811a7de61bbf1599aebb0815644d4733a3ebbf Mon Sep 17 00:00:00 2001 +From fcda0b2df242d08fad74af85951e36afd5b0fced Mon Sep 17 00:00:00 2001 From: "Kyale, Eliud" -Date: Fri, 28 Mar 2025 13:07:51 -0400 +Date: Mon, 26 May 2025 12:51:34 -0400 Subject: [PATCH] Build and compatibility for StarlingX. -Disable BPF compiler flag in MakeFile Disable redhat specific headers in Makefile Change Environment config to /etc/default/stalld Add $CUSTOM enviroment variable to stalld startup arguments Signed-off-by: Kyale, Eliud --- - Makefile | 4 ++-- + Makefile | 2 +- systemd/Makefile | 8 ++++---- - systemd/stalld.service | 5 +++-- - 3 files changed, 9 insertions(+), 8 deletions(-) + systemd/stalld.service | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index 5875e0d..95f228c 100644 +index 4585b6c..e735c7f 100644 --- a/Makefile +++ b/Makefile -@@ -9,7 +9,7 @@ ARCH=$(shell uname -m) - endif - $(info ARCH=$(ARCH)) - --USE_BPF := 1 -+USE_BPF := 0 - FCF_PROTECTION := -fcf-protection - MTUNE := -mtune=generic - M64 := -m64 @@ -48,7 +48,7 @@ MOPTS := $(strip $(MTUNE)) $(strip $(M64)) -mno-omit-leaf-frame-pointer - + WOPTS := -Wall -Werror=format-security - + -SOPTS := -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -+# SOPTS := -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 - ++#SOPTS := -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 + DEFS := -DUSE_BPF=$(USE_BPF) -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS - + diff --git a/systemd/Makefile b/systemd/Makefile -index 393e64b..3a0cb1a 100644 +index 99db1ad..c1da68e 100644 --- a/systemd/Makefile +++ b/systemd/Makefile @@ -1,17 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Red Hat specific Makefile +# Debian specific Makefile - + INSTALL := install UNITDIR := /usr/lib/systemd/system - + install: - $(INSTALL) -m 755 -d $(DESTDIR)/etc/sysconfig - $(INSTALL) stalld.conf -m 644 $(DESTDIR)/etc/sysconfig/stalld @@ -56,18 +46,18 @@ index 393e64b..3a0cb1a 100644 + $(INSTALL) stalld.conf -m 644 $(DESTDIR)/etc/default/stalld $(INSTALL) -m 755 -d $(DESTDIR)$(UNITDIR) $(INSTALL) stalld.service -m 644 $(DESTDIR)$(UNITDIR) - + uninstall: - rm -f $(DESTDIR)/etc/sysconfig/stalld + rm -f $(DESTDIR)/etc/default/stalld - rm -f 644 $(DESTDIR)$(UNITDIR)/stalld.service + rm -f $(DESTDIR)$(UNITDIR)/stalld.service clean: @rm -rf *~ diff --git a/systemd/stalld.service b/systemd/stalld.service -index 4d788c8..2411926 100644 +index 96fca1f..fef512a 100644 --- a/systemd/stalld.service +++ b/systemd/stalld.service -@@ -5,17 +5,18 @@ Description=Stall Monitor +@@ -5,13 +5,13 @@ Description=Stall Monitor [Service] Type=simple # Type=forking @@ -75,19 +65,13 @@ index 4d788c8..2411926 100644 +EnvironmentFile=/etc/default/stalld ExecStartPre=/usr/bin/throttlectl off ExecStartPre=/usr/bin/mkdir -p /run/stalld - + # In case the regex passed to IT or IP includes C escape sequences, # use ${IT} or ${IP} instead of $IT or $IP -ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP $BE +ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP $BE $CUSTOM ExecStopPost=/usr/bin/throttlectl on - CPUSchedulingPolicy=fifo - CPUSchedulingPriority=10 Restart=always - -+ - [Install] - WantedBy=multi-user.target --- -2.34.1 +-- +2.34.1