commit: e570678453f45c1d34a3c0cd1e12a14ade8ff9ef Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Oct 8 14:17:16 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 14:40:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5706784
sys-apps/systemd: bump to 235 Closes: https://bugs.gentoo.org/633656 Package-Manager: Portage-2.3.10_p4, Repoman-2.3.3_p52 sys-apps/systemd/Manifest | 1 + ...wdb-and-sysv-generator-if-the-features-ar.patch | 44 ++++++++++++++++++++++ ...sr-lib-systemd-s.patch => generator-path.patch} | 0 sys-apps/systemd/systemd-234-r4.ebuild | 2 +- .../{systemd-9999.ebuild => systemd-235.ebuild} | 12 ++++-- sys-apps/systemd/systemd-9999.ebuild | 11 ++++-- 6 files changed, 61 insertions(+), 9 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index e4684c7c942..0bfb021bca2 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,3 +1,4 @@ DIST systemd-233-man.tar.gz 31386 SHA256 825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 WHIRLPOOL ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159 DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176 DIST systemd-234.tar.gz 4800186 SHA256 da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68 WHIRLPOOL 9ff9f25ce82514db969a427eee51c0483b2bcaaa611f93c1fc17c356ea25eee712217708c54101ecaafd835cd8ac988b16e8ad411b48541a32442b9a0d148f07 +DIST systemd-235.tar.gz 6586406 SHA256 25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 WHIRLPOOL 05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6cbbbb1caf5afb17502555cc52fe06cd diff --git a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch new file mode 100644 index 00000000000..bd2b3364369 --- /dev/null +++ b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch @@ -0,0 +1,44 @@ +From c013a410d0ec5f419ce8d53df19946795849591b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Sun, 8 Oct 2017 09:47:05 -0400 +Subject: [PATCH] test: skip hwdb and sysv-generator if the features are + disabled + +--- + test/meson.build | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/test/meson.build b/test/meson.build +index 995a97177..c2df7ec22 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -163,9 +163,11 @@ endif + + ############################################################ + +-sysv_generator_test_py = find_program('sysv-generator-test.py') +-test('sysv-generator-test', +- sysv_generator_test_py) ++if conf.get('HAVE_SYSV_COMPAT') == 1 ++ sysv_generator_test_py = find_program('sysv-generator-test.py') ++ test('sysv-generator-test', ++ sysv_generator_test_py) ++endif + + ############################################################ + +@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl') + test('udev-test', + udev_test_pl) + +-hwdb_test_sh = find_program('hwdb-test.sh') +-test('hwdb-test', +- hwdb_test_sh) ++if conf.get('ENABLE_HWDB') == 1 ++ hwdb_test_sh = find_program('hwdb-test.sh') ++ test('hwdb-test', ++ hwdb_test_sh) ++endif +-- +2.14.2 + diff --git a/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch b/sys-apps/systemd/files/generator-path.patch similarity index 100% rename from sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch rename to sys-apps/systemd/files/generator-path.patch diff --git a/sys-apps/systemd/systemd-234-r4.ebuild b/sys-apps/systemd/systemd-234-r4.ebuild index 0085a0578fa..a4c94bd3a96 100644 --- a/sys-apps/systemd/systemd-234-r4.ebuild +++ b/sys-apps/systemd/systemd-234-r4.ebuild @@ -148,7 +148,6 @@ src_unpack() { src_prepare() { local PATCHES=( - "${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch "${FILESDIR}"/234-0002-cryptsetup-fix-infinite-timeout-6486.patch "${FILESDIR}"/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch "${FILESDIR}"/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch @@ -160,6 +159,7 @@ src_prepare() { "${FILESDIR}/228-noclean-tmp.patch" "${FILESDIR}/233-systemd-user-pam.patch" "${FILESDIR}/234-uucp-group.patch" + "${FILESDIR}/generator-path.patch" ) fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-235.ebuild similarity index 95% copy from sys-apps/systemd/systemd-9999.ebuild copy to sys-apps/systemd/systemd-235.ebuild index 6be7da5ca64..6647d41a680 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-235.ebuild @@ -148,6 +148,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch ) if ! use vanilla; then @@ -156,6 +157,7 @@ src_prepare() { "${FILESDIR}/228-noclean-tmp.patch" "${FILESDIR}/233-systemd-user-pam.patch" "${FILESDIR}/234-uucp-group.patch" + "${FILESDIR}/generator-path.patch" ) fi @@ -319,11 +321,13 @@ multilib_src_install_all() { # If we install these symlinks, there is no way for the sysadmin to remove them # permanently. - rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die - rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die - rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die + rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die + rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die + rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die + rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6be7da5ca64..3a0d6c4312e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -156,6 +156,7 @@ src_prepare() { "${FILESDIR}/228-noclean-tmp.patch" "${FILESDIR}/233-systemd-user-pam.patch" "${FILESDIR}/234-uucp-group.patch" + "${FILESDIR}/generator-path.patch" ) fi @@ -319,11 +320,13 @@ multilib_src_install_all() { # If we install these symlinks, there is no way for the sysadmin to remove them # permanently. - rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die - rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die - rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die - rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die + rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die + rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die + rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die + rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die
