| 1 |
vapier 08/03/23 01:42:35 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: baselayout-2.0.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump #212696. |
| 7 |
(Portage version: 2.2_pre5) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.461 sys-apps/baselayout/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.461&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.461&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.460&r2=1.461 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v |
| 19 |
retrieving revision 1.460 |
| 20 |
retrieving revision 1.461 |
| 21 |
diff -u -r1.460 -r1.461 |
| 22 |
--- ChangeLog 11 Mar 2008 00:00:47 -0000 1.460 |
| 23 |
+++ ChangeLog 23 Mar 2008 01:42:29 -0000 1.461 |
| 24 |
@@ -1,10 +1,15 @@ |
| 25 |
# ChangeLog for sys-apps/baselayout |
| 26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.460 2008/03/11 00:00:47 wolf31o2 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.461 2008/03/23 01:42:29 vapier Exp $ |
| 29 |
|
| 30 |
# See the rc-scripts ChangeLog in subversion for release info: |
| 31 |
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog |
| 32 |
|
| 33 |
+*baselayout-2.0.0 (23 Mar 2008) |
| 34 |
+ |
| 35 |
+ 23 Mar 2008; Mike Frysinger <vapier@g.o> +baselayout-2.0.0.ebuild: |
| 36 |
+ Version bump #212696. |
| 37 |
+ |
| 38 |
11 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 39 |
baselayout-1.11.15-r3.ebuild, baselayout-1.12.10-r5.ebuild, |
| 40 |
baselayout-1.12.11.ebuild, baselayout-1.12.11.1.ebuild: |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 sys-apps/baselayout/baselayout-2.0.0.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: baselayout-2.0.0.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2008 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.1 2008/03/23 01:42:29 vapier Exp $ |
| 54 |
|
| 55 |
inherit multilib |
| 56 |
|
| 57 |
DESCRIPTION="Filesystem baselayout and init scripts" |
| 58 |
HOMEPAGE="http://www.gentoo.org/" |
| 59 |
SRC_URI="mirror://gentoo/${P}.tar.bz2 |
| 60 |
http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" |
| 61 |
|
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 65 |
IUSE="build" |
| 66 |
|
| 67 |
PDEPEND="sys-apps/openrc" |
| 68 |
|
| 69 |
pkg_preinst() { |
| 70 |
# We need to install directories and maybe some dev nodes when building |
| 71 |
# stages, but they cannot be in CONTENTS. |
| 72 |
# Also, we cannot reference $S as binpkg will break so we do this. |
| 73 |
if use build ; then |
| 74 |
local libdirs="$(get_all_libdirs)" dir= |
| 75 |
# Create our multilib dirs - the Makefile has no knowledge of this |
| 76 |
: ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... |
| 77 |
for dir in ${libdirs}; do |
| 78 |
mkdir -p "${ROOT}${dir}" |
| 79 |
touch "${ROOT}${dir}"/.keep |
| 80 |
mkdir -p "${ROOT}usr/${dir}" |
| 81 |
touch "${ROOT}usr/${dir}"/.keep |
| 82 |
mkdir -p "${ROOT}usr/local/${dir}" |
| 83 |
touch "${ROOT}usr/local/${dir}"/.keep |
| 84 |
done |
| 85 |
|
| 86 |
# Ugly compatibility with stupid ebuilds and old profiles symlinks |
| 87 |
if [ "${SYMLINK_LIB}" = "yes" ] ; then |
| 88 |
rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} 2>/dev/null |
| 89 |
local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) |
| 90 |
ln -s "${lib}" "${ROOT}lib" |
| 91 |
ln -s "${lib}" "${ROOT}usr/lib" |
| 92 |
ln -s "${lib}" "${ROOT}usr/local/lib" |
| 93 |
fi |
| 94 |
|
| 95 |
emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" |
| 96 |
fi |
| 97 |
} |
| 98 |
|
| 99 |
src_install() { |
| 100 |
local libdir="lib" |
| 101 |
[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") |
| 102 |
|
| 103 |
emake \ |
| 104 |
OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \ |
| 105 |
LIB=${libdir} \ |
| 106 |
DESTDIR="${D}" \ |
| 107 |
install || die |
| 108 |
dodoc ChangeLog |
| 109 |
|
| 110 |
# Should this belong in another ebuild? Like say binutils? |
| 111 |
# List all the multilib libdirs in /etc/env/04multilib (only if they're |
| 112 |
# actually different from the normal |
| 113 |
if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then |
| 114 |
local libdirs="$(get_all_libdirs)" libdirs_env= dir= |
| 115 |
: ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... |
| 116 |
for dir in ${libdirs}; do |
| 117 |
libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} |
| 118 |
done |
| 119 |
|
| 120 |
# Special-case uglyness... For people updating from lib32 -> lib amd64 |
| 121 |
# profiles, keep lib32 in the search path while it's around |
| 122 |
if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! hasq lib32 ${libdirs}; then |
| 123 |
libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" |
| 124 |
fi |
| 125 |
echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib |
| 126 |
doenvd "${T}"/04multilib |
| 127 |
fi |
| 128 |
|
| 129 |
# rc-scripts version for testing of features that *should* be present |
| 130 |
echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release |
| 131 |
} |
| 132 |
|
| 133 |
pkg_postinst() { |
| 134 |
# We installed some files to /usr/share/baselayout instead of /etc to stop |
| 135 |
# (1) overwriting the user's settings |
| 136 |
# (2) screwing things up when attempting to merge files |
| 137 |
# (3) accidentally packaging up personal files with quickpkg |
| 138 |
# If they don't exist then we install them |
| 139 |
for x in master.passwd passwd shadow group fstab ; do |
| 140 |
[ -e "${ROOT}etc/${x}" ] && continue |
| 141 |
[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue |
| 142 |
cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc |
| 143 |
done |
| 144 |
|
| 145 |
# This is also written in src_install (so it's in CONTENTS), but |
| 146 |
# write it here so that the new version is immediately in the file |
| 147 |
# (without waiting for the user to do etc-update) |
| 148 |
rm -f "${ROOT}"/etc/._cfg????_gentoo-release |
| 149 |
local release="${PV}" |
| 150 |
[ "${PR}" != r0 ] && release="${release}-${PR}" |
| 151 |
echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release |
| 152 |
|
| 153 |
# whine about users that lack passwords #193541 |
| 154 |
if [[ -e ${ROOT}/etc/shadow ]] ; then |
| 155 |
local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow) |
| 156 |
if [[ -n ${bad_users} ]] ; then |
| 157 |
echo |
| 158 |
ewarn "The following users lack passwords!" |
| 159 |
ewarn ${bad_users} |
| 160 |
fi |
| 161 |
fi |
| 162 |
} |
| 163 |
|
| 164 |
|
| 165 |
|
| 166 |
-- |
| 167 |
gentoo-commits@l.g.o mailing list |
Archives