Added a portage version check to each target that uses --newuse to ensure a high...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@522 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 18057f77fe3fa2ac72f657bb57c2acb37004cc9e..232568931e821d6d8138c6c115e30a1283509b51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.148 2005/01/13 20:52:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.149 2005/01/13 22:57:25 wolf31o2 Exp $
+
+  13 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh,
+  targets/stage3/stage3-chroot.sh:
+  Added a portage version check to each target that uses --newuse to ensure a
+  high enough version is used. This resolves bug #75336.
 
   13 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/files/livecd-local.start:

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 85579d8ad41180f8eb183c0b524f5a456de0d222..c26a25076c232c561e3b1143ad0a33c25e9ff46d 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.11 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.12 2005/01/13 22:57:25 wolf31o2 Exp $
+
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
 
 /usr/sbin/env-update
 source /etc/profile

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 4e7f8226acc695896bd1609949d632acfa493f60..8dd5c2eb864edab018bd0d01d5fe66e4c68f1c4b 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.11 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.12 2005/01/13 22:57:25 wolf31o2 Exp $
+
+# check portage version in seed stage
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
 
 /usr/sbin/env-update
 source /etc/profile

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 5ebcc841d5b14b2a58d8596e540f84a7218a3eaa..0c0d7b93ce11c48fba5d906e0b1f6efdfa2db06c 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.11 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.12 2005/01/13 22:57:25 wolf31o2 Exp $
+
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
 
 /usr/sbin/env-update
 source /etc/profile

diff --git a/targets/netboot/netboot-packages.sh b/targets/netboot/netboot-packages.sh
index 99518c51b99dfe0ab481f7f095bbca370e3a1935..e5d392e23da12bbbf4032c4d637072f9dc7fb6a4 100644 (file)
--- a/targets/netboot/netboot-packages.sh
+++ b/targets/netboot/netboot-packages.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.3 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.4 2005/01/13 22:57:25 wolf31o2 Exp $
+
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
 
 /usr/sbin/env-update
 source /etc/profile

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index b72477f7f9f159070da856c3725b0ed7306df703..0be0e35cbaed28eeb1f1e8da5c9039fb9e812028 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,8 +1,17 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.26 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.27 2005/01/13 22:57:25 wolf31o2 Exp $
                
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
+
 /usr/sbin/env-update
 source /etc/profile
 

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 7865269eabfebee903d0ccd32ef2096f43c9efc5..7348e72013be8ee39347eafe4b89eb9f3574dcea 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.15 2005/01/11 14:10:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.16 2005/01/13 22:57:25 wolf31o2 Exp $
+
+portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
+       | cut -d/ -f2 | cut -d- -f2,3`
+if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
+then
+       echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
+       echo "2.0.51 or greater is required."
+       exit 1
+fi
 
 /usr/sbin/env-update
 source /etc/profile