| 1 |
uberlord 07/10/23 10:08:18 |
| 2 |
|
| 3 |
Modified: baselayout-2.0.0_rc5.ebuild |
| 4 |
Log: |
| 5 |
Fix upgrade downgrade cycle |
| 6 |
(Portage version: 2.1.3.15) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: baselayout-2.0.0_rc5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- baselayout-2.0.0_rc5.ebuild 22 Oct 2007 20:45:13 -0000 1.3 |
| 22 |
+++ baselayout-2.0.0_rc5.ebuild 23 Oct 2007 10:08:17 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild,v 1.3 2007/10/22 20:45:13 uberlord Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild,v 1.4 2007/10/23 10:08:17 uberlord Exp $ |
| 28 |
|
| 29 |
inherit flag-o-matic eutils toolchain-funcs multilib |
| 30 |
|
| 31 |
@@ -171,7 +171,7 @@ |
| 32 |
( |
| 33 |
. "${ROOT}etc/conf.d/rc" |
| 34 |
svcdir="${svcdir:-/var/lib/init.d}" |
| 35 |
- einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d" |
| 36 |
+ einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rc/init.d" |
| 37 |
cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rc/init.d |
| 38 |
rm -rf "${ROOT}"lib/rc/init.d/daemons \ |
| 39 |
"${ROOT}"lib/rc/init.d/console |
| 40 |
@@ -279,12 +279,13 @@ |
| 41 |
( |
| 42 |
. "${ROOT}etc/conf.d/rc" |
| 43 |
svcdir="${svcdir:-/var/lib/init.d}" |
| 44 |
- einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}" |
| 45 |
+ einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}${svcdir}" |
| 46 |
mkdir -p "${ROOT}${svcdir}" |
| 47 |
- cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}" |
| 48 |
+ cp -RPp "${ROOT}lib/rc/init.d"/* "${ROOT}${svcdir}" |
| 49 |
rm -rf "${ROOT}${svcdir}"/daemons |
| 50 |
- umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null |
| 51 |
- rm -rf "${ROOT}lib/rcscripts/init.d" |
| 52 |
+ umount "${ROOT}lib/rc/init.d" 2>/dev/null |
| 53 |
+ rm -rf "${ROOT}lib/rc/init.d" "${ROOT}lib/rc/console" |
| 54 |
+ rmdir "${ROOT}lib/rc" 2>/dev/null |
| 55 |
) |
| 56 |
elif has_version "<sys-apps/${PN}-2.0.0_rc5" ; then |
| 57 |
einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}lib/rcscripts/init.d" |
| 58 |
@@ -292,7 +293,7 @@ |
| 59 |
cp -RPp "${ROOT}"lib/rc/init.d/* "${ROOT}"lib/rcscripts/init.d |
| 60 |
umount "${ROOT}"lib/rc/init.d 2>/dev/null |
| 61 |
rm -rf "${ROOT}"lib/rc/init.d |
| 62 |
- [ -d "${ROPT}"/lib/rc/console ] && \ |
| 63 |
+ [ -d "${ROOT}"/lib/rc/console ] && \ |
| 64 |
mv "${ROOT}"lib/rc/console "${ROOT}"lib/rcscripts |
| 65 |
rmdir "${ROOT}"lib/rc 2>/dev/null |
| 66 |
fi |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
-- |
| 71 |
gentoo-commits@g.o mailing list |
Archives