| 1 |
zmedico 08/04/17 17:42:18 |
| 2 |
|
| 3 |
Modified: ChangeLog baselayout-2.0.0.ebuild |
| 4 |
Log: |
| 5 |
Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of the |
| 6 |
baselayout-1.x ebuild copies all the real configs from the user's |
| 7 |
/etc/conf.d into ${D}, it makes them all appear to be the default |
| 8 |
versions. In order to protect them from being unmerged after this upgrade, |
| 9 |
modify their timestamps during pkg_preinst(). |
| 10 |
(Portage version: 2.1.5_rc4_p9919) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.466 sys-apps/baselayout/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.466&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.466&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.465&r2=1.466 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v |
| 22 |
retrieving revision 1.465 |
| 23 |
retrieving revision 1.466 |
| 24 |
diff -u -r1.465 -r1.466 |
| 25 |
--- ChangeLog 8 Apr 2008 01:31:19 -0000 1.465 |
| 26 |
+++ ChangeLog 17 Apr 2008 17:42:18 -0000 1.466 |
| 27 |
@@ -1,10 +1,17 @@ |
| 28 |
# ChangeLog for sys-apps/baselayout |
| 29 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.465 2008/04/08 01:31:19 dirtyepic Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.466 2008/04/17 17:42:18 zmedico Exp $ |
| 32 |
|
| 33 |
# See the rc-scripts ChangeLog in subversion for release info: |
| 34 |
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog |
| 35 |
|
| 36 |
+ 17 Apr 2008; Zac Medico <zmedico@g.o> baselayout-2.0.0.ebuild: |
| 37 |
+ Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of the |
| 38 |
+ baselayout-1.x ebuild copies all the real configs from the user's |
| 39 |
+ /etc/conf.d into ${D}, it makes them all appear to be the default |
| 40 |
+ versions. In order to protect them from being unmerged after this upgrade, |
| 41 |
+ modify their timestamps during pkg_preinst(). |
| 42 |
+ |
| 43 |
08 Apr 2008; Ryan Hill <dirtyepic@g.o> baselayout-2.0.0.ebuild: |
| 44 |
Keyword ~mips. |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.3 sys-apps/baselayout/baselayout-2.0.0.ebuild |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.3&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.3&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.2&r2=1.3 |
| 54 |
|
| 55 |
Index: baselayout-2.0.0.ebuild |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v |
| 58 |
retrieving revision 1.2 |
| 59 |
retrieving revision 1.3 |
| 60 |
diff -u -r1.2 -r1.3 |
| 61 |
--- baselayout-2.0.0.ebuild 8 Apr 2008 01:31:19 -0000 1.2 |
| 62 |
+++ baselayout-2.0.0.ebuild 17 Apr 2008 17:42:18 -0000 1.3 |
| 63 |
@@ -1,6 +1,6 @@ |
| 64 |
# Copyright 1999-2008 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.2 2008/04/08 01:31:19 dirtyepic Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.3 2008/04/17 17:42:18 zmedico Exp $ |
| 68 |
|
| 69 |
inherit multilib |
| 70 |
|
| 71 |
@@ -17,6 +17,13 @@ |
| 72 |
PDEPEND="sys-apps/openrc" |
| 73 |
|
| 74 |
pkg_preinst() { |
| 75 |
+ # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of |
| 76 |
+ # the baselayout-1.x ebuild copies all the real configs from the user's |
| 77 |
+ # /etc/conf.d into ${D}, it makes them all appear to be the default |
| 78 |
+ # versions. In order to protect them from being unmerged after this |
| 79 |
+ # upgrade, modify their timestamps. |
| 80 |
+ touch "${ROOT}"/etc/conf.d/* 2>/dev/null |
| 81 |
+ |
| 82 |
# We need to install directories and maybe some dev nodes when building |
| 83 |
# stages, but they cannot be in CONTENTS. |
| 84 |
# Also, we cannot reference $S as binpkg will break so we do this. |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
-- |
| 89 |
gentoo-commits@l.g.o mailing list |
Archives