multiple bugfixes, check changelog

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

diff --git a/ChangeLog b/ChangeLog
index d3d837e020e8eef5bf3b2acb637c771b2fb8ada6..22bbbce861e6e54358e61b339e70cfd809504cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.93 2004/10/12 17:33:40 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.94 2004/10/12 18:01:22 zhen Exp $
+
+  12 Oct 2004; John Davis <zhen@gentoo.org>
+  targets/embedded/cramfs-runscript.sh, targets/embedded/embedded-chroot.sh,
+  +targets/embedded/unmerge.sh, targets/grp/grp-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh, targets/netboot/netboot.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh,
+  livecd/runscript-support/kmerge.sh:
+  bugfixes for #67195, #67197, #67122, and #46918
 
   12 Oct 2004; John Davis <zhen@gentoo.org> modules/netboot.py:
   small netboot fixups

diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh
index cb1076350a0008afa720f67c203cf59a06c3a4be..7203687c3d03a10392786b6879a6c5cba931ac7f 100755 (executable)
--- a/livecd/runscript-support/pre-kmerge.sh
+++ b/livecd/runscript-support/pre-kmerge.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.3 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.4 2004/10/12 18:01:22 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-emerge -k -b genkernel
+if [ ! -e "/usr/bin/genkernel" ]
+then
+       emerge -k -b genkernel
+fi
+
 install -d /usr/portage/packages/gk_binaries
 rm -f /usr/src/linux

diff --git a/targets/embedded/cramfs-runscript.sh b/targets/embedded/cramfs-runscript.sh
index 46a516b70aabfd1791aa35fa14ff1aeb5b42b556..897963b474b3173ccf50199883b3919b17e25798 100644 (file)
--- a/targets/embedded/cramfs-runscript.sh
+++ b/targets/embedded/cramfs-runscript.sh
@@ -11,10 +11,6 @@ die() {
 
 case $1 in
        run)
-               # move this to preclean stage
-               # it's a hack because dhcpcd is lame
-               install -d $root_fs_path/var/lib/dhcpc
-       
                install -d $clst_image_path
                mkcramfs $root_fs_path $clst_image_path/root.img
                imagesize=`du -sk $clst_image_path/root.img | cut -f1`

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index fb4bd80087761775bde73a7e04901010b926f034..590fab185e79a1c15a83455ec23344d19433aeab 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.8 2004/10/05 13:22:06 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.9 2004/10/12 18:01:22 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,7 @@ fi
 
 if [ -n "${clst_PKGCACHE}" ]
 then
-       export clst_myemergeopts="--usepkg --buildpkg"
+       export clst_myemergeopts="--usepkg --buildpkg --newuse"
 fi
 
 # setup the environment

diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
new file mode 100644 (file)
index 0000000..9084453
--- /dev/null
+++ b/targets/embedded/unmerge.sh
@@ -0,0 +1,7 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/unmerge.sh,v 1.1 2004/10/12 18:01:22 zhen Exp $
+
+${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF
+       ROOT=/tmp/mergeroot emerge -C $* || exit 1
+EOF

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 59c1578d923d0d779538f97c2e36b592e3ae09a3..2cc110b71988c757b26d2d544b463ca13f9249c7 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.8 2004/10/05 13:22:06 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.9 2004/10/12 18:01:22 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -39,11 +39,11 @@ then
 
        if [ -n "${clst_VERBOSE}" ]
        then
-               emerge --usepkg --buildpkg --noreplace -vp ${clst_grp_packages} || exit 1
+               emerge --usepkg --buildpkg --noreplace --newuse -vp ${clst_grp_packages} || exit 1
                sleep 15
        fi
        
-       emerge --usepkg --buildpkg --noreplace ${clst_grp_packages} || exit 1
+       emerge --usepkg --buildpkg --noreplace --newuse ${clst_grp_packages} || exit 1
 else
        unset DISTDIR
        #don't grab MS core fonts, etc.

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index a4be0addd342357a34d4bf84987ff7de67a7d62b..63ba8642c03d5dbd3e5099bb43e36eadbdf7c5ee 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.7 2004/10/05 13:22:06 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.8 2004/10/12 18:01:22 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,7 @@ fi
 
 if [ -n "${clst_PKGCACHE}" ]
 then
-       clst_emergeopts="--usepkg --buildpkg"
+       clst_emergeopts="--usepkg --buildpkg --newuse"
 else
        clst_emergeopts=""
 fi

diff --git a/targets/netboot/netboot.sh b/targets/netboot/netboot.sh
index cb7303820486acfd7186f10172429dffc5c17cf6..14a7026f6fc67ff41eb6725d7397d6227d164423 100644 (file)
--- a/targets/netboot/netboot.sh
+++ b/targets/netboot/netboot.sh
@@ -1,7 +1,7 @@
 #!/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.sh,v 1.4 2004/10/11 15:54:48 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot.sh,v 1.5 2004/10/12 18:01:22 zhen Exp $
 
 export GK_BINARIES=/var/tmp/gk_binaries
 export IMAGE_PATH=/tmp/image
@@ -17,7 +17,7 @@ then
 fi
 if [ -n "${clst_PKGCACHE}" ]
 then
-       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg"
+       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 fi
 
 scriptdir=${clst_sharedir}/targets/netboot

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 0b64d1a48b1a78db17fcbb8c3a4e0dca5394abe2..0f394b17ceadcb9c6df82291ea1c1ddd620eb843 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.22 2004/10/05 13:22:06 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.23 2004/10/12 18:01:22 zhen Exp $
                
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,7 @@ fi
 
 if [ -n "${clst_PKGCACHE}" ]
 then
-       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg"
+       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 fi
 
 # setup our environment
@@ -36,7 +36,8 @@ install -d ${ROOT}
 export clst_buildpkgs="$(/tmp/build.py)"
 STAGE1_USE="$(source /etc/make.profile/make.defaults ; echo ${STAGE1_USE})"
 
-USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1
+# duplicate line to below - why is this here??
+#USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1
 
 if [ -n "${clst_VERBOSE}" ]
 then
@@ -44,4 +45,4 @@ then
        sleep 15
 fi
 
-USE="-* build" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1
+USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 7949ef7d605df7b0b5cc8ef759752d4531febd76..767c28c74f99baef281bb27b5359e31c0958ebff 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.10 2004/10/05 13:22:07 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.11 2004/10/12 18:01:22 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,7 @@ fi
 
 if [ -n "${clst_PKGCACHE}" ]
 then
-       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg"
+       export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 fi
 
 GRP_STAGE23_USE="$(source /etc/make.profile/make.defaults ; echo ${GRP_STAGE23_USE})"