From abd43bc49456f2bde50d59b5513db89782ffbb4e Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Oct 09 2023 22:47:52 +0000 Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale --- diff --git a/sources b/sources index 3fa0ff2..c07beac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-253.7.tar.gz) = d8427adc1158a1dcc8b574e1beb79f91ed068cdbee11761e57efe27196fceb8d1ee0c4325e32bc4dc2f3f382bbe7c36d317f8a46dac66f53245385ffc1d5a73e -SHA512 (systemd-hs+fb-253.7.tar.gz) = 651b6dad6fec20a45387be2e72f4663daed339e99cebb57f18c0dcc3e1716a32de5300b7149fa57706781fb483b1bc6a2d34f47b43f3a4aad2da3108558da097 +SHA512 (systemd-hs-253.7.tar.gz) = 9344184f774d1d847d5b3bea96d24b3e759d4a274f3427d12fc36e70cb9d38cb353d76250f040a1732b311e565eb6415c55109cd99024b4d20ded3e910a759f1 +SHA512 (systemd-hs+fb-253.7.tar.gz) = fc8c9d258728b82da934fe85a547fef1f9b5857183442bcd22a4209239d41f4d68cb562f92f8d3bd49084601acd12dd633f594c377d04a82eca6da3ca8ecffa7 diff --git a/systemd.spec b/systemd.spec index 7662adc..b0f4369 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,9 +2,9 @@ %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %if 0%{?facebook} -%global hs_commit 9d24499df65a22d10953508b0808a87768c964c1 +%global hs_commit 6ecdef4d56122be0f141dc47435bec294e22f937 %else -%global hs_commit 59ef89051aa8e6cfd2e5060b48275caeb5af0da3 +%global hs_commit 1f18345f5fce3cfd90d0a476052bf756b658ff2b %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -39,7 +39,7 @@ Version: 253.7 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 1.6%{?dist} +Release: 1.7%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -1299,6 +1299,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Mon Oct 09 2023 Anita Zhang - 253.7-1.7 +- Add threads dependency to test-process-util to fix C8s build + * Mon Sep 18 2023 Daan De Meyer - 253.7-1.7 - Limit parallelism when running tests to avoid hitting bug in python 3.6