* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.1-r1.ebuild
@ 2010-11-04 0:33 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-11-04 0:33 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/11/04 00:33:57
Modified: ChangeLog
Added: baselayout-2.0.1-r1.ebuild
Log:
Fix Stage1 building wrt #232823.
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
Revision Changes Path
1.483 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.483&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.483&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.482&r2=1.483
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- ChangeLog 8 Oct 2010 01:43:23 -0000 1.482
+++ ChangeLog 4 Nov 2010 00:33:57 -0000 1.483
@@ -1,10 +1,16 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.482 2010/10/08 01:43:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.483 2010/11/04 00:33:57 ssuominen Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+*baselayout-2.0.1-r1 (04 Nov 2010)
+
+ 04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +baselayout-2.0.1-r1.ebuild, +files/baselayout-2.0.1-proc_touch.patch:
+ Fix Stage1 building wrt #232823.
+
08 Oct 2010; Mart Raudsepp <leio@gentoo.org> baselayout-1.11.15-r3.ebuild:
Drop to ~mips
1.1 sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: baselayout-2.0.1-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.1 2010/11/04 00:33:57 ssuominen Exp $
inherit eutils multilib
DESCRIPTION="Filesystem baselayout and init scripts"
HOMEPAGE="http://www.gentoo.org/"
SRC_URI="mirror://gentoo/${P}.tar.bz2
http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="build"
PDEPEND="sys-apps/openrc"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-proc_touch.patch #232823
}
pkg_preinst() {
# Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
# the baselayout-1.x ebuild copies all the real configs from the user's
# /etc/conf.d into ${D}, it makes them all appear to be the default
# versions. In order to protect them from being unmerged after this
# upgrade, modify their timestamps.
touch "${ROOT}"/etc/conf.d/* 2>/dev/null
# We need to install directories and maybe some dev nodes when building
# stages, but they cannot be in CONTENTS.
# Also, we cannot reference $S as binpkg will break so we do this.
if use build ; then
local libdirs="$(get_all_libdirs)" dir=
# Create our multilib dirs - the Makefile has no knowledge of this
: ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
for dir in ${libdirs}; do
mkdir -p "${ROOT}${dir}"
touch "${ROOT}${dir}"/.keep
mkdir -p "${ROOT}usr/${dir}"
touch "${ROOT}usr/${dir}"/.keep
mkdir -p "${ROOT}usr/local/${dir}"
touch "${ROOT}usr/local/${dir}"/.keep
done
# Create symlinks for /lib, /usr/lib, and /usr/local/lib and
# merge contents of duplicate directories if necessary.
# Only do this when $ROOT != / since it should only be necessary
# when merging to an empty $ROOT, and it's not very safe to perform
# this operation when $ROOT = /.
if [ "${SYMLINK_LIB}" = yes ] && [ "$ROOT" != / ] ; then
local prefix libabi=$(get_abi_LIBDIR $DEFAULT_ABI)
for prefix in "$ROOT"{,usr/,usr/local/} ; do
[ ! -d "${prefix}lib" ] && rm -f "${prefix}lib" && \
mkdir -p "${prefix}lib"
[ ! -d "$prefix$libabi" ] && ln -sf "${prefix}lib"
[ -h "$prefix$libabi" ] && [ -d "${prefix}lib" ] && \
[ "$prefix$libabi" -ef "${prefix}lib" ] && continue
local destdir=$prefix$libabi/ srcdir=${prefix}lib/
[ -d "$destdir" ] || die "unable to create '$destdir'"
[ -d "$srcdir" ] || die "unable to create $srcdir"
mv -f "$srcdir".keep "$destdir".keep 2>/dev/null
if ! rmdir "$srcdir" 2>/dev/null ; then
ewarn "merging contents of '$srcdir' into '$destdir':"
# Move directories if the dest doesn't exist.
find "$srcdir" -type d -print0 | \
while read -d $'\0' src ; do
# If a parent directory of $src has already
# been merged then it will no longer exist.
[ -d "$src" ] || continue
dest=$destdir${src#${srcdir}}
if [ ! -d "$dest" ] ; then
if [ -e "$dest" ] ; then
ewarn " not overwriting file '$dest'" \
"with directory '$src'"
continue
fi
mv -f "$src" "$dest" && \
ewarn " /${src#${ROOT}} merged" || \
ewarn " /${src#${ROOT}} not merged"
fi
done
# Move non-directories.
find "$srcdir" ! -type d -print0 | \
while read -d $'\0' src ; do
dest=$destdir${src#${srcdir}}
if [ -e "$dest" ] ; then
if [ -d "$dest" ] ; then
ewarn " not overwriting directory '$dest'" \
"with file '$src'"
else
if [ -f "$src" -a ! -s "$src" ] && \
[ -f "$dest" -a ! -s "$dest" ] ; then
# Ignore empty files such as '.keep'.
true
else
ewarn " not overwriting file '$dest'" \
"with file '$src'"
fi
fi
continue
fi
mv -f "$src" "$dest" && \
ewarn " /${src#${ROOT}} merged" || \
ewarn " /${src#${ROOT}} not merged"
done
fi
rm -rf "${prefix}lib" || \
die "unable to remove '${prefix}lib'"
ln -s "$libabi" "${prefix}lib" || \
die "unable to create '${prefix}lib' symlink"
done
fi
emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
fi
rm -f "${D}"/usr/share/${PN}/Makefile
}
src_install() {
local libdir="lib"
[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
emake \
OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \
LIB=${libdir} \
DESTDIR="${D}" \
install || die
dodoc ChangeLog
# need the makefile in pkg_preinst
insinto /usr/share/${PN}
doins Makefile || die
# Should this belong in another ebuild? Like say binutils?
# List all the multilib libdirs in /etc/env/04multilib (only if they're
# actually different from the normal
if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then
local libdirs="$(get_all_libdirs)" libdirs_env= dir=
: ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
for dir in ${libdirs}; do
libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
done
# Special-case uglyness... For people updating from lib32 -> lib amd64
# profiles, keep lib32 in the search path while it's around
if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! hasq lib32 ${libdirs}; then
libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
fi
echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
doenvd "${T}"/04multilib
fi
# rc-scripts version for testing of features that *should* be present
echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
}
pkg_postinst() {
local x
# We installed some files to /usr/share/baselayout instead of /etc to stop
# (1) overwriting the user's settings
# (2) screwing things up when attempting to merge files
# (3) accidentally packaging up personal files with quickpkg
# If they don't exist then we install them
for x in master.passwd passwd shadow group fstab ; do
[ -e "${ROOT}etc/${x}" ] && continue
[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
done
# Force shadow permissions to not be world-readable #260993
for x in shadow ; do
[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
done
# This is also written in src_install (so it's in CONTENTS), but
# write it here so that the new version is immediately in the file
# (without waiting for the user to do etc-update)
rm -f "${ROOT}"/etc/._cfg????_gentoo-release
local release="${PV}"
[ "${PR}" != r0 ] && release="${release}-${PR}"
echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release
# whine about users that lack passwords #193541
if [[ -e ${ROOT}/etc/shadow ]] ; then
local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
if [[ -n ${bad_users} ]] ; then
echo
ewarn "The following users lack passwords!"
ewarn ${bad_users}
fi
fi
# whine about users with invalid shells #215698
if [[ -e ${ROOT}/etc/passwd ]] ; then
local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
if [[ -n ${bad_shells} ]] ; then
echo
ewarn "The following users have non-existent shells!"
ewarn "${bad_shells}"
fi
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.1-r1.ebuild
@ 2010-12-13 8:05 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2010-12-13 8:05 UTC (permalink / raw
To: gentoo-commits
vapier 10/12/13 08:05:07
Modified: ChangeLog baselayout-2.0.1-r1.ebuild
Log:
Redo how we handle forced gentoo-release update so we avoid md5/mtime mismatches with CONTENTS.
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)
Revision Changes Path
1.491 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.491&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.491&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.490&r2=1.491
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- ChangeLog 5 Dec 2010 17:39:21 -0000 1.490
+++ ChangeLog 13 Dec 2010 08:05:07 -0000 1.491
@@ -1,10 +1,15 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.490 2010/12/05 17:39:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.491 2010/12/13 08:05:07 vapier Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 13 Dec 2010; Mike Frysinger <vapier@gentoo.org>
+ baselayout-2.0.1-r1.ebuild:
+ Redo how we handle forced gentoo-release update so we avoid md5/mtime
+ mismatches with CONTENTS.
+
05 Dec 2010; Raúl Porcel <armin76@gentoo.org> baselayout-1.12.14-r1.ebuild:
alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #343925
1.2 sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild?r1=1.1&r2=1.2
Index: baselayout-2.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baselayout-2.0.1-r1.ebuild 4 Nov 2010 00:33:57 -0000 1.1
+++ baselayout-2.0.1-r1.ebuild 13 Dec 2010 08:05:07 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.1 2010/11/04 00:33:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.2 2010/12/13 08:05:07 vapier Exp $
inherit eutils multilib
@@ -30,6 +30,11 @@
# upgrade, modify their timestamps.
touch "${ROOT}"/etc/conf.d/* 2>/dev/null
+ # This is written in src_install (so it's in CONTENTS), but punt all
+ # pending updates to avoid user having to do etc-update (and make the
+ # pkg_postinst logic simpler).
+ rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+
# We need to install directories and maybe some dev nodes when building
# stages, but they cannot be in CONTENTS.
# Also, we cannot reference $S as binpkg will break so we do this.
@@ -190,13 +195,10 @@
[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
done
- # This is also written in src_install (so it's in CONTENTS), but
- # write it here so that the new version is immediately in the file
- # (without waiting for the user to do etc-update)
- rm -f "${ROOT}"/etc/._cfg????_gentoo-release
- local release="${PV}"
- [ "${PR}" != r0 ] && release="${release}-${PR}"
- echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release
+ # Take care of the etc-update for the user
+ if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
+ mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
+ fi
# whine about users that lack passwords #193541
if [[ -e ${ROOT}/etc/shadow ]] ; then
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-13 8:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-13 8:05 [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.1-r1.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2010-11-04 0:33 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox