From 808586671b076a064c900922fe526f4e3f310822 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 6 Jan 2012 10:19:44 +0000 Subject: [PATCH] Migrate to /usr. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- sys-apps/systemd/ChangeLog | 14 +- sys-apps/systemd/Manifest | 21 ++- .../files/update-etc-systemd-symlinks.path | 5 + .../files/update-etc-systemd-symlinks.service | 6 + .../files/update-etc-systemd-symlinks.sh | 19 ++ sys-apps/systemd/systemd-29-r3.ebuild | 8 +- sys-apps/systemd/systemd-29-r4.ebuild | 168 +++++++++++++++++ sys-apps/systemd/systemd-37-r1.ebuild | 8 +- sys-apps/systemd/systemd-37-r2.ebuild | 170 ++++++++++++++++++ 9 files changed, 403 insertions(+), 16 deletions(-) create mode 100644 sys-apps/systemd/files/update-etc-systemd-symlinks.path create mode 100644 sys-apps/systemd/files/update-etc-systemd-symlinks.service create mode 100755 sys-apps/systemd/files/update-etc-systemd-symlinks.sh create mode 100644 sys-apps/systemd/systemd-29-r4.ebuild create mode 100644 sys-apps/systemd/systemd-37-r2.ebuild diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 859dc2aafe79..27b5d2f4bc1a 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/systemd -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.16 2011/12/12 08:17:37 mgorny Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.17 2012/01/06 10:19:43 mgorny Exp $ + +*systemd-37-r2 (06 Jan 2012) +*systemd-29-r4 (06 Jan 2012) + + 06 Jan 2012; Michał Górny systemd-29-r3.ebuild, + +systemd-29-r4.ebuild, systemd-37-r1.ebuild, +systemd-37-r2.ebuild, + +files/update-etc-systemd-symlinks.path, + +files/update-etc-systemd-symlinks.service, + +files/update-etc-systemd-symlinks.sh: + Migrate to /usr. *systemd-37-r1 (12 Dec 2011) *systemd-29-r3 (12 Dec 2011) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 7fe2aee605c1..e83115b00399 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -2,18 +2,23 @@ Hash: SHA256 AUX gentoo-run.conf 226 RMD160 3bea7b3d3fe3b3589d8bfdeaf52112ab46a67e82 SHA1 521d0d3ff408905075f42b3b00ccc77da2355c6a SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 +AUX update-etc-systemd-symlinks.path 119 RMD160 b2512605a2313af9fca6b611a32b66e2c435577a SHA1 70ddad85c6981b9a0a81f1d0f84f4b039951c543 SHA256 4dbbe99fdc4b7922ad6fb4c6f39c975a4b139e04b04a65e3c79650b364fdc02a +AUX update-etc-systemd-symlinks.service 165 RMD160 aab6eb2ff82ae82be72c12682fda2bc62d7b2e51 SHA1 6a766b8ef0a97290431756c8bbabf242447c632e SHA256 77f199392367cefc6d70110b955fb5f2ebafaf21ea8ca355b1863a44f130bf69 +AUX update-etc-systemd-symlinks.sh 451 RMD160 94066bbc526f108e2a3a49ad3b8dc52eb1ed4ad7 SHA1 9ad3fa9e5bef1b7d10a54101ddedb299d0f875a7 SHA256 1ed27cf8c2ca5ab862b9d935eec613d1a21ceb4cc363a4bfdac6430387e350df DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971 DIST systemd-37.tar.bz2 931101 RMD160 d0b15083fe938039972f38a30c757ed8b10a5998 SHA1 02665bcb8c609193170579537c3a94013519405c SHA256 b38492bde73649cc3520953354ef446c268169c1d342614183655e9ee1a1bbc5 -EBUILD systemd-29-r3.ebuild 4090 RMD160 54a9ffd044e8a3d4ae2aa9fe914bade644a4d4da SHA1 8a5c817b08bc2c2247a5c0c071fa13dc73d42197 SHA256 1ccb73077ebfb92ad85a3a001fb00e2a1b69f41b95f2badc80a636fa6203c075 -EBUILD systemd-37-r1.ebuild 4107 RMD160 18a4a060af9b95cf9e9751f8ef456999f44293b9 SHA1 82f8a20e2fce1f6aedfd0cecd91eb410d9bd9614 SHA256 a75100d382b03e29e82a2fc9af1807e94af0f62fb1d74bbf53a4234ef89a72ec -MISC ChangeLog 2962 RMD160 d9a4360dc9f70e8be717c30cbf348ae10ae75f89 SHA1 39e1a83513a9a242bab13987c3fb6fd9702fd224 SHA256 4f1ccf5046f0b4e1adfa4da5df8e45a3f7752c3ead6cec433c4786373e424c24 +EBUILD systemd-29-r3.ebuild 4156 RMD160 e8e2c538b561bc98b339d4c6db34ddde6b26b67e SHA1 11a01d9ea81b142b952e3e8490a1695965c0417c SHA256 1936747e42a9af19eb62b6ca62811d9e5df337afb8499b59056183f0c77090db +EBUILD systemd-29-r4.ebuild 4924 RMD160 5208d5c5df8902273dbc9c4d953c1cb5470e2f06 SHA1 4ef93a1fa059b06153c169ee87521118eed5b9d9 SHA256 c1d2af99c2399b27544230871bc55d54f48ef6003703334973f898567ef0186e +EBUILD systemd-37-r1.ebuild 4173 RMD160 9faa7b2ba5a70378b635aa76e542881ecdba9a0a SHA1 fc570db8a8a56e0c04b1a813e841711229f6f3e2 SHA256 105ad32ee8d080835d6a7648024f913b6eaee183a2daf022d56e1b367481f10e +EBUILD systemd-37-r2.ebuild 4941 RMD160 0a98064af7b0805a8522008ab355eb3c603bd012 SHA1 633a4125dfe317341f0250bf699fe54781489698 SHA256 517ffd58ca6316a6382db8665c1cd13e66e292591f06b7998c115340194334c3 +MISC ChangeLog 3313 RMD160 573909e9ff5d2fc69116bbaaff2990de607fb95e SHA1 6dd2d5a13039e963af6d3508542a1216244dedc9 SHA256 4dc75bfa206ae9841e9be2be092d896c8c3420ce5e634b5bdd503ebc6f00537b MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk7luNsACgkQfXuS5UK5QB179AP/QLtSk6AENyU2dcV476TDBSMR -9itxdfCm0Y3FCgJ3U2W51P3mPzfxNmIJyyTBLtavTb9IJtP/yn+/dU/C1OvDhVEK -36czYyZO9nJvjnR+4j8cqodnq5h9JEbSiGq+fvXaU98WgMdO5Iur7/eIM0HjkCSR -F6oSzGUDNYI3ZLp8Sfc= -=tU5F +iJwEAQEIAAYFAk8GyxoACgkQfXuS5UK5QB0lswP/U6CA4BmYyHz0cCq9heK3GV5n +AWwm+WCao0mf34t60gLtNokzqID9uRBH9V54WiIeGlyQZTfolN81dG5qUEPUtTpU +WY7Hu91EnLkdk8TXBzj5OCrIUncqJftuZYT2hLG9XtXZKc1RCjDYXjwYGOcexIKl +KeFSZykP/kQv0LxeCNk= +=WMHs -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path new file mode 100644 index 000000000000..33a95763da2a --- /dev/null +++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.path @@ -0,0 +1,5 @@ +[Unit] +Description=Update /etc/systemd/system symlinks for units moved to /usr + +[Path] +PathChanged=/lib/systemd/system diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.service b/sys-apps/systemd/files/update-etc-systemd-symlinks.service new file mode 100644 index 000000000000..c05a19439d9b --- /dev/null +++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.service @@ -0,0 +1,6 @@ +[Unit] +Description=Update /etc/systemd/system symlinks for units moved to /usr + +[Service] +Type=oneshot +ExecStart=/usr/libexec/systemd/update-etc-systemd-symlinks.sh diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh new file mode 100755 index 000000000000..ce81bba58f25 --- /dev/null +++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# Update symlinks to systemd units moved into /usr/systemd. +# (c) 2012 Michał Górny +# Released under the terms of the 2-clause BSD license + +IFS_SAVE=${IFS} +IFS=' +' +# follow + symlink type will match broken symlinks only +set -- $(find -L /etc/systemd/system -type l -print) +IFS=${IFS_SAVE} + +for f; do + old_path=$(readlink "${f}") + new_path=/usr/lib${old_path#/lib} + if [ -f "${new_path}" ]; then + ln -v -s -f "${new_path}" "${f}" + fi +done diff --git a/sys-apps/systemd/systemd-29-r3.ebuild b/sys-apps/systemd/systemd-29-r3.ebuild index 3cb1a89cb052..5bb1c567d3bf 100644 --- a/sys-apps/systemd/systemd-29-r3.ebuild +++ b/sys-apps/systemd/systemd-29-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-29-r3.ebuild,v 1.1 2011/12/12 08:17:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-29-r3.ebuild,v 1.2 2012/01/06 10:19:43 mgorny Exp $ EAPI=4 @@ -40,8 +40,10 @@ MINKV="2.6.38" # dbus, udev versions because of systemd units # blocker on old packages to avoid collisions with above # openrc blocker to avoid udev rules starting openrc scripts +# systemd blocker due to /usr migration RDEPEND="${COMMON_DEPEND} - !/dev/null + eend ${?} + fi +} diff --git a/sys-apps/systemd/systemd-37-r1.ebuild b/sys-apps/systemd/systemd-37-r1.ebuild index c1df28dc5cab..62dc59ae9d2f 100644 --- a/sys-apps/systemd/systemd-37-r1.ebuild +++ b/sys-apps/systemd/systemd-37-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-37-r1.ebuild,v 1.1 2011/12/12 08:17:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-37-r1.ebuild,v 1.2 2012/01/06 10:19:43 mgorny Exp $ EAPI=4 @@ -41,8 +41,10 @@ MINKV="2.6.38" # dbus, udev versions because of systemd units # blocker on old packages to avoid collisions with above # openrc blocker to avoid udev rules starting openrc scripts +# systemd blocker due to /usr migration RDEPEND="${COMMON_DEPEND} - !/dev/null + eend ${?} + fi +} -- 2.26.2