diff options
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/files/247-cgroup-test.patch | 35 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-247.2-r4.ebuild | 3 |
3 files changed, 39 insertions, 2 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index b118910936c0..3171caee9ef1 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,3 +1,4 @@ +AUX 247-cgroup-test.patch 1859 BLAKE2B e97d638c96e0f9c783736227031ac8774dfa5c2040bfb828abbbc14faa1edde312187ff2314d9f762081bc93dd5ecec077229e30aeb46ade43410c961feed965 SHA512 1c08ce1e7a8e56b68966666d8af5764f903e2d851a288e3e1bc78ad58f7223d7a52486ed4b1c1a4afef0ba24e4b90eecea56df9f2139c771a935e050bf436aff AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0 @@ -9,6 +10,6 @@ DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592 -EBUILD systemd-247.2-r4.ebuild 15729 BLAKE2B f69ffe1d93cc5d2ee2e065aed95eead585ff385504b8eea8b124086b642c1f9a97e1526f90fa3b2e48736683906b3df477a3aafdf1cc008c6475d7591fab8684 SHA512 89eaa2a59907c996903ea1809a6688dd9160138eed7b29386f8884646b302f5ed1e33b20ecb88ef4bb3ef01e2accfb23d5096b92cc2a28b66daace5e544e6be1 +EBUILD systemd-247.2-r4.ebuild 15766 BLAKE2B 51833eca4fe5b60b72fd8b7a4f23726da3dc88946737426a6bb513ae18cb96c81fd373b0c21fd844a6a12184b800b5363acb2b2f8f6c35e77d0dfceac3724d7c SHA512 20064f79166a8faa1b6da1a4ec0849d1bfb7416b8a958e129df72aa76dfbbc63b1fce9ead8b67300377f98083a5be4ceef4d4d4afc149299194aeb0a0d6ec1ab EBUILD systemd-9999.ebuild 15731 BLAKE2B e1021ad90a8f0b60829f2da18947c0c21d9fe590bd4e0e591030964c57ef6774d7b1c39189d0e7291c3e590b68a32a932edba10dfe16810fd9154306e721bcaa SHA512 2d7f30712144e5071a6463c0117b8d476b5e771d6fa0213d89b8b5e3aaadd8ee09defef207cb0d7149c76a644c3d5ff60f95c7cf9529f9f4ac84d00a94ba26ee MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696 diff --git a/sys-apps/systemd/files/247-cgroup-test.patch b/sys-apps/systemd/files/247-cgroup-test.patch new file mode 100644 index 000000000000..bfa4422a6211 --- /dev/null +++ b/sys-apps/systemd/files/247-cgroup-test.patch @@ -0,0 +1,35 @@ +From ddfc6ad061ad47caeeff901d27cbc59af85e0db3 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 9 Mar 2021 17:57:37 -0500 +Subject: [PATCH] cg_unified_cached: return ENOMEDIUM if we cannot find a known + hierarchy + +When the test suite is being run in a foreign environment, +/sys/fs/cgroup might not be set up in a way that we recognize. +Returning ENOMEDIUM causes the tests to be skipped in this case. + +Bug: https://bugs.gentoo.org/771819 +--- + src/basic/cgroup-util.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 527043a2b39..0b252eb28fb 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -2052,8 +2052,14 @@ int cg_unified_cached(bool flush) { + unified_cache = CGROUP_UNIFIED_SYSTEMD; + unified_systemd_v232 = false; + } else { +- if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) ++ if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) { ++ if (errno == ENOENT) { ++ /* Some other software may have set up /sys/fs/cgroup in a configuration we do not recognize. */ ++ log_debug_errno(errno, "Unsupported cgroupsv1 setup detected: name=systemd hierarchy not found."); ++ return -ENOMEDIUM; ++ } + return log_debug_errno(errno, "statfs(\"/sys/fs/cgroup/systemd\" failed: %m"); ++ } + + if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) { + log_debug("Found cgroup2 on /sys/fs/cgroup/systemd, unified hierarchy for systemd controller (v232 variant)"); diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild index 2239dc02efc4..4853d82c9c9c 100644 --- a/sys-apps/systemd/systemd-247.2-r4.ebuild +++ b/sys-apps/systemd/systemd-247.2-r4.ebuild @@ -16,7 +16,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" fi PYTHON_COMPAT=( python3_{7..9} ) @@ -212,6 +212,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}"/247-cgroup-test.patch ) if ! use vanilla; then |