Removing any functions that we now call by default when we source chroot-functions...

[catalyst.git] / targets / embedded / embedded-chroot.sh

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index bab840cb1e1f3c56302efac25bce6961172c522b..6f2b97b024231dc20b723a3eee7f16b81492959c 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,29 +1,15 @@
 #!/bin/bash
-# Copyright 1999-2005 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.21 2006/10/02 20:25:25 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
-update_env_settings
-
-setup_myfeatures
-setup_myemergeopts
-
 # Setup the environment
-export FEATURES="${clst_myfeatures}"
-#export clst_myemergeopts="${clst_myemergeopts} -O"
-export USE="${clst_use}"
-export DESTROOT=${clst_root_path}
-export clst_root_path=/
-
-run_emerge "${clst_myemergeopts}" -o "${clst_embedded_packages}"
+export DESTROOT="${clst_root_path}"
+export clst_root_path="/"
 
-#export clst_myemergeopts="${clst_myemergeopts} -B"
-#run_emerge "${clst_embedded_packages}"
+echo "Installing dependencies into ${DESTROOT}..."
+run_emerge -o "${clst_embedded_packages}"
 
-export clst_root_path=${DESTROOT}
-export clst_myemergeopts="${clst_myemergeopts} -1 -O"
+export clst_root_path="${DESTROOT}"
 export INSTALL_MASK="${clst_install_mask}" 
 
-run_emerge "${clst_embedded_packages}"
+run_emerge -1 -O "${clst_embedded_packages}"