diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-28 03:59:26 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-28 03:59:26 +0000 |
| commit | 1d418f2d14905b513deb0e3c0fae172d2b8ae08f (patch) | |
| tree | 03c829a23f2d04056092b2581d49b348b3d94811 /targets/embedded | |
| parent | Rearrange some of the functions in chroot-functions.sh in preparation for som... (diff) | |
| download | catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.tar.gz catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.tar.bz2 catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.zip | |
Changing run_emerge to run_merge, changing both setup_portage and setup_myfeatures to add any USE changes to make.conf prior to merge, then removing the settings added, rather than (ab)using the environment.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1333 d1e1f19c-881f-0410-ab34-b69fee027534
Diffstat (limited to 'targets/embedded')
| -rwxr-xr-x | targets/embedded/embedded-chroot.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index bdc1ddad..89e834c5 100755 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.sh @@ -7,9 +7,9 @@ export DESTROOT="${clst_root_path}" export clst_root_path="/" echo "Installing dependencies into ${DESTROOT}..." -run_emerge -o "${clst_embedded_packages}" +run_merge -o "${clst_embedded_packages}" export clst_root_path="${DESTROOT}" export INSTALL_MASK="${clst_install_mask}" -run_emerge -1 -O "${clst_embedded_packages}" +run_merge -1 -O "${clst_embedded_packages}" |