| 1 |
mgorny 13/07/31 07:09:02 |
| 2 |
|
| 3 |
Modified: systemd-9999-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Finally drop compatibility symlinks. This time for real. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-apps/systemd/systemd-9999-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: systemd-9999-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- systemd-9999-r1.ebuild 30 Jul 2013 08:48:24 -0000 1.2 |
| 23 |
+++ systemd-9999-r1.ebuild 31 Jul 2013 07:09:02 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.2 2013/07/30 08:48:24 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.3 2013/07/31 07:09:02 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -99,22 +99,6 @@ |
| 33 |
~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" |
| 34 |
# ~!FW_LOADER_USER_HELPER" |
| 35 |
|
| 36 |
- # read null-terminated argv[0] from PID 1 |
| 37 |
- # and see which path to systemd was used (if any) |
| 38 |
- local init_path |
| 39 |
- IFS= read -r -d '' init_path < /proc/1/cmdline |
| 40 |
- if [[ ${init_path} == */bin/systemd ]]; then |
| 41 |
- eerror "You are using a compatibility symlink to run systemd. The symlink" |
| 42 |
- eerror "has been removed. Please update your bootloader to use:" |
| 43 |
- eerror |
| 44 |
- eerror " init=/usr/lib/systemd/systemd" |
| 45 |
- eerror |
| 46 |
- eerror "and reboot your system. We are sorry for the inconvenience." |
| 47 |
- if [[ ${MERGE_TYPE} != buildonly ]]; then |
| 48 |
- die "Compatibility symlink used to boot systemd." |
| 49 |
- fi |
| 50 |
- fi |
| 51 |
- |
| 52 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 53 |
if [[ $(gcc-major-version) -lt 4 |
| 54 |
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] |
| 55 |
@@ -212,23 +196,10 @@ |
| 56 |
udevlibexecdir="${MY_UDEVDIR}" \ |
| 57 |
dist_udevhwdb_DATA= |
| 58 |
|
| 59 |
- # keep udev working without initramfs, for openrc compat |
| 60 |
- dodir /bin /sbin |
| 61 |
- mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die |
| 62 |
- mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die |
| 63 |
- dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd |
| 64 |
- dosym ../../bin/udevadm /usr/bin/udevadm |
| 65 |
- |
| 66 |
# zsh completion |
| 67 |
insinto /usr/share/zsh/site-functions |
| 68 |
newins shell-completion/systemd-zsh-completion.zsh "_${PN}" |
| 69 |
|
| 70 |
- # compat for init= use |
| 71 |
- dosym ../usr/lib/systemd/systemd /bin/systemd |
| 72 |
- dosym ../lib/systemd/systemd /usr/bin/systemd |
| 73 |
- # rsyslog.service depends on it... |
| 74 |
- dosym ../usr/bin/systemctl /bin/systemctl |
| 75 |
- |
| 76 |
# we just keep sysvinit tools, so no need for the mans |
| 77 |
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
| 78 |
|| die |
| 79 |
@@ -240,14 +211,6 @@ |
| 80 |
# Preserve empty dirs in /etc & /var, bug #437008 |
| 81 |
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
| 82 |
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd |
| 83 |
- |
| 84 |
- # Check whether we won't break user's system. |
| 85 |
- local x |
| 86 |
- for x in /bin/systemd /usr/bin/systemd \ |
| 87 |
- /usr/bin/udevadm /usr/lib/systemd/systemd-udevd |
| 88 |
- do |
| 89 |
- [[ -x ${D}${x} ]] || die "${x} symlink broken, aborting." |
| 90 |
- done |
| 91 |
} |
| 92 |
|
| 93 |
optfeature() { |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.153 sys-apps/systemd/ChangeLog |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.153&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.153&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.152&r2=1.153 |
| 102 |
|
| 103 |
Index: ChangeLog |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v |
| 106 |
retrieving revision 1.152 |
| 107 |
retrieving revision 1.153 |
| 108 |
diff -u -r1.152 -r1.153 |
| 109 |
--- ChangeLog 30 Jul 2013 08:48:24 -0000 1.152 |
| 110 |
+++ ChangeLog 31 Jul 2013 07:09:02 -0000 1.153 |
| 111 |
@@ -1,6 +1,9 @@ |
| 112 |
# ChangeLog for sys-apps/systemd |
| 113 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.152 2013/07/30 08:48:24 mgorny Exp $ |
| 115 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.153 2013/07/31 07:09:02 mgorny Exp $ |
| 116 |
+ |
| 117 |
+ 31 Jul 2013; Michał Górny <mgorny@g.o> systemd-9999-r1.ebuild: |
| 118 |
+ Finally drop compatibility symlinks. This time for real. |
| 119 |
|
| 120 |
30 Jul 2013; Michał Górny <mgorny@g.o> systemd-206.ebuild, |
| 121 |
systemd-9999-r1.ebuild: |
Archives