diff options
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch | 25 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-245-r5.ebuild (renamed from sys-apps/systemd/systemd-245-r3.ebuild) | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 6 |
4 files changed, 36 insertions, 6 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index cd87c85a4a6f..c61598b63c4b 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -4,6 +4,7 @@ AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada +AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e @@ -13,6 +14,6 @@ DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76 EBUILD systemd-243-r2.ebuild 14590 BLAKE2B 536b1996e88366d7aa24a474305f05ca2cd6d5e4f026c1fd8392679fd21bf1bba28ca8bf39121427faa1fd412fa3950d45e863e75a9cf2e4f16b3c499da68555 SHA512 49b6883b2a72a986a32bf084fb962698399449859b3dba42db6a08090a018a7598f4af0eb05dd86615005e72e3b4a72d0c4da7891407b1e0537cf7953c5510ab EBUILD systemd-244.3.ebuild 14582 BLAKE2B 47660116f69e9b59f0fc125d206f41cb7a94b0d70245c6ce92de957ab294fe6e969797ff05d16dec46fe6430173dae0a29ec68fe99ea960e18d731e231a5f038 SHA512 00034a5c3ee577d1719756aab0721c23ee1b944896d875fc1fb81c41481aa1683b6d155ed42ba3ba2979b2a2b44c2231dc531f888b8fe4b9fcaf80260a712c06 EBUILD systemd-244.ebuild 14570 BLAKE2B 918be50336353a5d5512653c61ed6c1e1cbb4f8e49ec7fd8b1eeb5436951ad82b3d7aa7fa0e313681a952dcbd64c7fd899bb5ac3a7a319a4508d099a358a8ab6 SHA512 1b9d610e10c5c1a21d80395a3a68f82f4201f6b1c23d7e57f98e09cb509a133e60484c5e72ae0c78819a189b930b2f77cca84e869af9f03fbc5a3a4ac9448ab2 -EBUILD systemd-245-r3.ebuild 15108 BLAKE2B bf53ade8f66dc1915c1c4cb7e50b47c212db1f0ac2e8eb58f9345b4bba340cd41fc57ae9d846c162827662a45f4af104055d41f1c9d7f02f16caecf6c8810a13 SHA512 6d97471af4cc84606e2abf55727cc959a43e4ab77833269deb0f5447996bb01c2c8ae222f7165ba8c7cfe7b2ecd7ce884334e16580d08eb17561f6d2a7e819ab -EBUILD systemd-9999.ebuild 15070 BLAKE2B 6df70c7cd6708ec4eb0d5b7e85df096ac92d45a0e05e906bd896318b1dbfe6a5a19df346fbc0d612d6774a201bd69a2e5df8396bff6f02fc212d8d8aa0c8a7fd SHA512 59133d4b9b8701c6ab9beeab93893d61f36a615adabc36cf76832ad8de9e13482fe226df52dee8985fa34e87efc563ff59b076cd50e16983883f9603d36d32be +EBUILD systemd-245-r5.ebuild 15251 BLAKE2B 8eba167408d962a162117c4d666e0eb22bcff38ecf444e012452de9b98ee6971e552c9c908ceb151c5e979f99e4c9d5332d7107f9f4fc5d1f64dea0e66e29f0a SHA512 b20b15040dcd671ee7adbc629e800438c55b8c3ed4ade6d96ee3b72e4a46a98b10e26943e818f73ab9155613008b5bf654e8fbcd0c7f32db085e81926c9e4651 +EBUILD systemd-9999.ebuild 15213 BLAKE2B 048641234fbf08029573549baca931671a16dd381f0ffe0892d9ef1e9a3db788bac1dd1553c144519df0d681b9187ca169aaf28eb12a96672273ccb5574e6405 SHA512 4bd17b988fc96bc271ffe69f38d30544d5c77ff8a98c744b4f5160781c42b8593c19958b32319f95919126dcda85aa44c696b9318c48d2348caa9f9d1225fe90 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696 diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch new file mode 100644 index 000000000000..d92d2d43a0c2 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch @@ -0,0 +1,25 @@ +From 7ccd5724afc6fa83ec6cd93dbaf4faf3671c88fc Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 27 Apr 2020 10:22:03 -0400 +Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts + +--- + src/systemctl/systemctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index d319d5d375..bb8419800c 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -6622,7 +6622,7 @@ static int import_environment(int argc, char *argv[], void *userdata) { + static int enable_sysv_units(const char *verb, char **args) { + int r = 0; + +-#if HAVE_SYSV_COMPAT ++#if 0 + _cleanup_(lookup_paths_free) LookupPaths paths = {}; + unsigned f = 0; + +-- +2.26.2 + diff --git a/sys-apps/systemd/systemd-245-r3.ebuild b/sys-apps/systemd/systemd-245-r5.ebuild index 0fd4ff855ecc..46c7844250b6 100644 --- a/sys-apps/systemd/systemd-245-r3.ebuild +++ b/sys-apps/systemd/systemd-245-r5.ebuild @@ -209,6 +209,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-generator-path-r1.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" ) fi @@ -256,8 +257,6 @@ multilib_src_configure() { -Dsplit-bin=true -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dsysvinit-path= - -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps @@ -356,6 +355,9 @@ multilib_src_install_all() { rm -f "${ED}${rootprefix}"/sbin/resolvconf || die fi + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + if ! use sysv-utils; then rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index dcf64e48a2af..b755eb2883ee 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -208,6 +208,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" ) fi @@ -255,8 +256,6 @@ multilib_src_configure() { -Dsplit-bin=true -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dsysvinit-path= - -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps @@ -355,6 +354,9 @@ multilib_src_install_all() { rm -f "${ED}${rootprefix}"/sbin/resolvconf || die fi + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + if ! use sysv-utils; then rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die |