From a88b0eb4e70e5a52eab276beedbb47daa1e8dba6 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Jan 2025 02:04:34 +0900 Subject: [PATCH 1/5] tools: drop workaround for CentOS 7 --- tools/meson-build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/meson-build.sh b/tools/meson-build.sh index 2366df23f9..64498be605 100755 --- a/tools/meson-build.sh +++ b/tools/meson-build.sh @@ -16,6 +16,4 @@ if [ ! -f "$builddir/build.ninja" ]; then CC="$CC" CXX="$CXX" meson setup -Dc_args="$c_args" -Dcpp_args="$cpp_args" "$builddir" "$sourcedir" $options fi -# Locate ninja binary, on CentOS 7 it is called ninja-build, so use that name if available. -command -v ninja-build >/dev/null && ninja="ninja-build" || ninja="ninja" -"$ninja" -C "$builddir" "$target" +ninja -C "$builddir" "$target" From 7a0c3923fee4887454427321f80452cec67e3bc7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Jan 2025 01:53:19 +0900 Subject: [PATCH 2/5] docs: replace link to RHEL7 document with RHEL9 documents --- docs/_data/extra_pages.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/_data/extra_pages.json b/docs/_data/extra_pages.json index 09a6bed09c..958ab86a6d 100644 --- a/docs/_data/extra_pages.json +++ b/docs/_data/extra_pages.json @@ -96,8 +96,13 @@ }, { "category": "Publications", - "title": "RHEL7 docs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/system_administrators_guide/chap-managing_services_with_systemd" + "title": "RHEL9 docs - Configuring basic system settings - Managing systemd", + "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_basic_system_settings/managing-systemd_configuring-basic-system-settings#managing-systemd_configuring-basic-system-settings" + }, + { + "category": "Publications", + "title": "RHEL9 docs - Using systemd unit files to customize and optimize your system", + "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/using_systemd_unit_files_to_customize_and_optimize_your_system/index" }, { "category": "Publications", From 066e603ac641e22b1827ce36c9d55311fa44be6e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Jan 2025 01:53:50 +0900 Subject: [PATCH 3/5] meson: drop workaround for CentOS 8 CentOS 8 and RHEL 8 reached EOL. --- meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meson.build b/meson.build index 933133e6b1..881dfb4306 100644 --- a/meson.build +++ b/meson.build @@ -1351,10 +1351,6 @@ libgcrypt = dependency('libgcrypt', required : feature) libgpg_error = dependency('gpg-error', required : feature.disabled() ? feature : false) -if not libgpg_error.found() - # CentOS 8 does not provide the .pc file. - libgpg_error = cc.find_library('gpg-error', required : feature) -endif have = libgcrypt.found() and libgpg_error.found() if not have From 1761c352754e0ef6577d6c2e4cee5a5b539f8dbe Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Jan 2025 01:55:18 +0900 Subject: [PATCH 4/5] test-network: nowadays it runs not only on CentOS --- test/test-network/systemd-networkd-tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 9203948d6c..ab9e5536f5 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -7923,7 +7923,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): self.assertGreater(prefixInfo[0]['PreferredLifetimeUSec'], 0) self.assertGreater(prefixInfo[0]['ValidLifetimeUSec'], 0) - @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10") + @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available") def test_dhcp6pd_no_address(self): # For issue #29979. copy_network_unit('25-veth.netdev', '25-dhcp6pd-server.network', '25-dhcp6pd-upstream-no-address.network') @@ -7945,7 +7945,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): self.check_dhcp6_prefix('veth99') - @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10") + @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available") def test_dhcp6pd_no_assign(self): # Similar to test_dhcp6pd_no_assign(), but in this case UseAddress=yes (default), # However, the server does not provide IA_NA. For issue #31349. @@ -7968,7 +7968,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities): self.check_dhcp6_prefix('veth99') - @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10") + @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available") def test_dhcp6pd(self): copy_network_unit('25-veth.netdev', '25-dhcp6pd-server.network', '25-dhcp6pd-upstream.network', '25-veth-downstream-veth97.netdev', '25-dhcp-pd-downstream-veth97.network', '25-dhcp-pd-downstream-veth97-peer.network', From 220f7aac8cd744186a8d6128d2a454501424925d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Jan 2025 01:55:55 +0900 Subject: [PATCH 5/5] test-network: drop workaround for old CentOS release --- test/test-network/systemd-networkd-tests.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index ab9e5536f5..b6549b96b3 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2862,10 +2862,6 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('fou') def test_fou(self): - # The following redundant check is necessary for CentOS CI. - # Maybe, error handling in lookup_id() in sd-netlink/generic-netlink.c needs to be updated. - self.assertTrue(is_module_available('fou')) - copy_network_unit('25-fou-ipproto-ipip.netdev', '25-fou-ipproto-gre.netdev', '25-fou-ipip.netdev', '25-fou-sit.netdev', '25-fou-gre.netdev', '25-fou-gretap.netdev')