* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-04-08 1:31 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 8+ messages in thread
From: Ryan Hill (dirtyepic) @ 2008-04-08 1:31 UTC (permalink / raw
To: gentoo-commits
dirtyepic 08/04/08 01:31:20
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
Keyword ~mips.
(Portage version: 2.2_pre5)
Revision Changes Path
1.465 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.465&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.465&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.464&r2=1.465
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- ChangeLog 31 Mar 2008 00:46:06 -0000 1.464
+++ ChangeLog 8 Apr 2008 01:31:19 -0000 1.465
@@ -1,10 +1,13 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.464 2008/03/31 00:46:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.465 2008/04/08 01:31:19 dirtyepic Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 08 Apr 2008; Ryan Hill <dirtyepic@gentoo.org> baselayout-2.0.0.ebuild:
+ Keyword ~mips.
+
31 Mar 2008; Mike Frysinger <vapier@gentoo.org>
baselayout-1.11.15-r3.ebuild, baselayout-1.12.11.1.ebuild,
baselayout-1.12.12.ebuild:
1.2 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.1&r2=1.2
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- baselayout-2.0.0.ebuild 23 Mar 2008 01:42:29 -0000 1.1
+++ baselayout-2.0.0.ebuild 8 Apr 2008 01:31:19 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.1 2008/03/23 01:42:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.2 2008/04/08 01:31:19 dirtyepic Exp $
inherit multilib
@@ -11,7 +11,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="build"
PDEPEND="sys-apps/openrc"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2009-03-02 20:17 Benedikt Boehm (hollow)
0 siblings, 0 replies; 8+ messages in thread
From: Benedikt Boehm (hollow) @ 2009-03-02 20:17 UTC (permalink / raw
To: gentoo-commits
hollow 09/03/02 20:17:47
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
fix /etc/shadow permissions when building stages
(Portage version: 2.2_rc23/cvs/Linux i686)
Revision Changes Path
1.471 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.471&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.471&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.470&r2=1.471
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- ChangeLog 19 Aug 2008 17:51:19 -0000 1.470
+++ ChangeLog 2 Mar 2009 20:17:46 -0000 1.471
@@ -1,10 +1,13 @@
# ChangeLog for sys-apps/baselayout
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.470 2008/08/19 17:51:19 zmedico Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.471 2009/03/02 20:17:46 hollow Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 02 Mar 2009; Benedikt Böhm <hollow@gentoo.org> baselayout-2.0.0.ebuild:
+ fix /etc/shadow permissions when building stages
+
19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
Avoid potential warning messages in the SYMLINK_LIB code which may be
triggered when find traverses a directory whose parent has already been
1.8 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.7&r2=1.8
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baselayout-2.0.0.ebuild 19 Aug 2008 17:51:19 -0000 1.7
+++ baselayout-2.0.0.ebuild 2 Mar 2009 20:17:47 -0000 1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.7 2008/08/19 17:51:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.8 2009/03/02 20:17:47 hollow Exp $
inherit multilib
@@ -177,6 +177,11 @@
cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
done
+ # fix shadow permissions to not be world-readable
+ for x in shadow ; do
+ [ -e "${ROOT}etc/${x}" ] && chmod 0600 "${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)
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-08-19 17:51 Zac Medico (zmedico)
0 siblings, 0 replies; 8+ messages in thread
From: Zac Medico (zmedico) @ 2008-08-19 17:51 UTC (permalink / raw
To: gentoo-commits
zmedico 08/08/19 17:51:20
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
Avoid potential warning messages in the SYMLINK_LIB code which may be
triggered when find traverses a directory whose parent has already been
merged from lib to lib64.
(Portage version: 2.2_rc8_p11419/cvs/Linux 2.6.26-0810-x86-64 i686)
Revision Changes Path
1.470 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.470&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.470&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.469&r2=1.470
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- ChangeLog 19 Aug 2008 06:12:52 -0000 1.469
+++ ChangeLog 19 Aug 2008 17:51:19 -0000 1.470
@@ -1,11 +1,16 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.469 2008/08/19 06:12:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.470 2008/08/19 17:51:19 zmedico Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
+ Avoid potential warning messages in the SYMLINK_LIB code which may be
+ triggered when find traverses a directory whose parent has already been
+ merged from lib to lib64.
+
+ 19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
Make the SYMLINK_LIB code in pkg_preinst merge files from lib directories
to lib64 directories when necessary, instead of blindly wiping out the
content of the lib dir. Thanks to Daniel Robbins for finding the cause of
1.7 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.6&r2=1.7
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baselayout-2.0.0.ebuild 19 Aug 2008 06:12:52 -0000 1.6
+++ baselayout-2.0.0.ebuild 19 Aug 2008 17:51:19 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.6 2008/08/19 06:12:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.7 2008/08/19 17:51:19 zmedico Exp $
inherit multilib
@@ -69,6 +69,11 @@
# 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
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-08-19 6:12 Zac Medico (zmedico)
0 siblings, 0 replies; 8+ messages in thread
From: Zac Medico (zmedico) @ 2008-08-19 6:12 UTC (permalink / raw
To: gentoo-commits
zmedico 08/08/19 06:12:53
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
Make the SYMLINK_LIB code in pkg_preinst merge files from lib directories
to lib64 directories when necessary, instead of blindly wiping out the
content of the lib dir. Thanks to Daniel Robbins for finding the cause of
this issue, which he discovered when building stage1 with catalyst.
(Portage version: 2.2_rc8_p11419/cvs/Linux 2.6.26-0810-x86-64 i686)
Revision Changes Path
1.469 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.469&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.469&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.468&r2=1.469
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- ChangeLog 10 May 2008 10:03:38 -0000 1.468
+++ ChangeLog 19 Aug 2008 06:12:52 -0000 1.469
@@ -1,10 +1,16 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.468 2008/05/10 10:03:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.469 2008/08/19 06:12:52 zmedico Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
+ Make the SYMLINK_LIB code in pkg_preinst merge files from lib directories
+ to lib64 directories when necessary, instead of blindly wiping out the
+ content of the lib dir. Thanks to Daniel Robbins for finding the cause of
+ this issue, which he discovered when building stage1 with catalyst.
+
10 May 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild:
Install the Makefile into $D so that we can use it in pkg_preinst steps (for
binpkgs) #218877 by Kevin Cody Jr.
1.6 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.5&r2=1.6
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baselayout-2.0.0.ebuild 10 May 2008 10:03:38 -0000 1.5
+++ baselayout-2.0.0.ebuild 19 Aug 2008 06:12:52 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.5 2008/05/10 10:03:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.6 2008/08/19 06:12:52 zmedico Exp $
inherit multilib
@@ -40,13 +40,81 @@
touch "${ROOT}usr/local/${dir}"/.keep
done
- # Ugly compatibility with stupid ebuilds and old profiles symlinks
- if [ "${SYMLINK_LIB}" = "yes" ] ; then
- rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} 2>/dev/null
- local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
- ln -s "${lib}" "${ROOT}lib"
- ln -s "${lib}" "${ROOT}usr/lib"
- ln -s "${lib}" "${ROOT}usr/local/lib"
+ # 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
+ 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"
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-05-10 10:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2008-05-10 10:03 UTC (permalink / raw
To: gentoo-commits
vapier 08/05/10 10:03:38
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
Install the Makefile into $D so that we can use it in pkg_preinst steps (for binpkgs) #218877 by Kevin Cody Jr.
(Portage version: 2.2_pre5)
Revision Changes Path
1.468 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.468&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.468&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.467&r2=1.468
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- ChangeLog 19 Apr 2008 06:22:52 -0000 1.467
+++ ChangeLog 10 May 2008 10:03:38 -0000 1.468
@@ -1,10 +1,14 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.467 2008/04/19 06:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.468 2008/05/10 10:03:38 vapier Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 10 May 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild:
+ Install the Makefile into $D so that we can use it in pkg_preinst steps (for
+ binpkgs) #218877 by Kevin Cody Jr.
+
19 Apr 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild:
Detect and display users with non-existent shells #215698.
1.5 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.4&r2=1.5
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- baselayout-2.0.0.ebuild 19 Apr 2008 06:22:52 -0000 1.4
+++ baselayout-2.0.0.ebuild 10 May 2008 10:03:38 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.4 2008/04/19 06:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.5 2008/05/10 10:03:38 vapier Exp $
inherit multilib
@@ -49,8 +49,9 @@
ln -s "${lib}" "${ROOT}usr/local/lib"
fi
- emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+ emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
fi
+ rm -f "${D}"/usr/share/${PN}/Makefile
}
src_install() {
@@ -64,6 +65,10 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-04-19 6:22 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-19 6:22 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/19 06:22:53
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
Detect and display users with non-existent shells #215698.
(Portage version: 2.2_pre5)
Revision Changes Path
1.467 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.467&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.467&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.466&r2=1.467
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- ChangeLog 17 Apr 2008 17:42:18 -0000 1.466
+++ ChangeLog 19 Apr 2008 06:22:52 -0000 1.467
@@ -1,10 +1,13 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.466 2008/04/17 17:42:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.467 2008/04/19 06:22:52 vapier Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild:
+ Detect and display users with non-existent shells #215698.
+
17 Apr 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
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
1.4 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.3&r2=1.4
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- baselayout-2.0.0.ebuild 17 Apr 2008 17:42:18 -0000 1.3
+++ baselayout-2.0.0.ebuild 19 Apr 2008 06:22:52 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.3 2008/04/17 17:42:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.4 2008/04/19 06:22:52 vapier Exp $
inherit multilib
@@ -116,4 +116,14 @@
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
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-04-17 17:42 Zac Medico (zmedico)
0 siblings, 0 replies; 8+ messages in thread
From: Zac Medico (zmedico) @ 2008-04-17 17:42 UTC (permalink / raw
To: gentoo-commits
zmedico 08/04/17 17:42:18
Modified: ChangeLog baselayout-2.0.0.ebuild
Log:
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 during pkg_preinst().
(Portage version: 2.1.5_rc4_p9919)
Revision Changes Path
1.466 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.466&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.466&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.465&r2=1.466
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- ChangeLog 8 Apr 2008 01:31:19 -0000 1.465
+++ ChangeLog 17 Apr 2008 17:42:18 -0000 1.466
@@ -1,10 +1,17 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.465 2008/04/08 01:31:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.466 2008/04/17 17:42:18 zmedico Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 17 Apr 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
+ 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 during pkg_preinst().
+
08 Apr 2008; Ryan Hill <dirtyepic@gentoo.org> baselayout-2.0.0.ebuild:
Keyword ~mips.
1.3 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.2&r2=1.3
Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- baselayout-2.0.0.ebuild 8 Apr 2008 01:31:19 -0000 1.2
+++ baselayout-2.0.0.ebuild 17 Apr 2008 17:42:18 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.2 2008/04/08 01:31:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.3 2008/04/17 17:42:18 zmedico Exp $
inherit multilib
@@ -17,6 +17,13 @@
PDEPEND="sys-apps/openrc"
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.
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild
@ 2008-03-23 1:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-23 1:42 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/23 01:42:35
Modified: ChangeLog
Added: baselayout-2.0.0.ebuild
Log:
Version bump #212696.
(Portage version: 2.2_pre5)
Revision Changes Path
1.461 sys-apps/baselayout/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.461&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.461&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.460&r2=1.461
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- ChangeLog 11 Mar 2008 00:00:47 -0000 1.460
+++ ChangeLog 23 Mar 2008 01:42:29 -0000 1.461
@@ -1,10 +1,15 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.460 2008/03/11 00:00:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.461 2008/03/23 01:42:29 vapier Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+*baselayout-2.0.0 (23 Mar 2008)
+
+ 23 Mar 2008; Mike Frysinger <vapier@gentoo.org> +baselayout-2.0.0.ebuild:
+ Version bump #212696.
+
11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
baselayout-1.11.15-r3.ebuild, baselayout-1.12.10-r5.ebuild,
baselayout-1.12.11.ebuild, baselayout-1.12.11.1.ebuild:
1.1 sys-apps/baselayout/baselayout-2.0.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.1&content-type=text/plain
Index: baselayout-2.0.0.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.1 2008/03/23 01:42:29 vapier Exp $
inherit 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="build"
PDEPEND="sys-apps/openrc"
pkg_preinst() {
# 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
# Ugly compatibility with stupid ebuilds and old profiles symlinks
if [ "${SYMLINK_LIB}" = "yes" ] ; then
rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} 2>/dev/null
local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
ln -s "${lib}" "${ROOT}lib"
ln -s "${lib}" "${ROOT}usr/lib"
ln -s "${lib}" "${ROOT}usr/local/lib"
fi
emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
fi
}
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
# 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() {
# 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
# 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
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-03-02 20:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-08 1:31 [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild Ryan Hill (dirtyepic)
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 20:17 Benedikt Boehm (hollow)
2008-08-19 17:51 Zac Medico (zmedico)
2008-08-19 6:12 Zac Medico (zmedico)
2008-05-10 10:03 Mike Frysinger (vapier)
2008-04-19 6:22 Mike Frysinger (vapier)
2008-04-17 17:42 Zac Medico (zmedico)
2008-03-23 1:42 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox