From 334f6a77cde47b2b108d936256e69d9576b35378 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: May 16 2023 08:11:34 +0000 Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale --- diff --git a/sources b/sources index 349c9bb..2e6e05e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-252.4.tar.gz) = 2200da8d76c1940545d4184389e104b878d7538a320748235e12ecfaca293d7075ba0bd432589eff059740e30066f14ac05757e6a309992cee1978ad3dbba0d2 -SHA512 (systemd-hs+fb-252.4.tar.gz) = 97e10903dd7f9742e3263ac34736c83b7606e6a238560624c8182bacef883535b15a3a19e05df5394b64ca5c8d41223dcb5963f04bd2b4d57e15caaa77716c00 +SHA512 (systemd-hs-252.4.tar.gz) = 9eaf3ee92ea0b39fa646be1372b1240b4f901af49e2facd3f87e5be740d4609ab34814d0772a99aada1e04c3b553ab05cef128fb295cfdd632aed33f8d07fa99 +SHA512 (systemd-hs+fb-252.4.tar.gz) = 95b4b07a9d3ee4ad90d65c5fecdc162b0729115ab24b78b93416a2b2d53e301660f173dc976d506aea7958937fd4a55d330b295d1941c25b8dae999dcfa4d071 diff --git a/systemd.spec b/systemd.spec index e5ac519..6fdfb48 100644 --- a/systemd.spec +++ b/systemd.spec @@ -4,9 +4,9 @@ %global stable 1 %if 0%{?facebook} -%global hs_commit b503711a2569ce76e6a735a5ea15669fc5e0a724 +%global hs_commit 90b17b51e8c4089f0b0d93aa437c2b4b1e3a8b67 %else -%global hs_commit ebdc7d8d718bc0aa48f18a2517ed209271a319b1 +%global hs_commit b2bf14d5dc581c4f111fe3edcea836bd317cad51 %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -43,7 +43,7 @@ Name: systemd Url: https://pagure.io/centos-sig-hyperscale/systemd %if %{without inplace} Version: 252.4 -Release: 598.10%{?dist} +Release: 598.11%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -1156,7 +1156,12 @@ fi %changelog -* Fri Apr 13 2023 Daan De Meyer - 252.4-598.10 +* Mon May 15 2023 Daan De Meyer - 252.4-598.11 +- Backport fixes for journald crashes and bad behavior when dealing with + corrupted journals. +- Fix changelog date + +* Thu Apr 13 2023 Daan De Meyer - 252.4-598.10 - Revert cpu controller delegation to user@.service commit for FB builds * Fri Feb 17 2023 Daan De Meyer - 252.4-598.9