aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-10 22:51:10 -0500
committerMike Frysinger <vapier@gentoo.org>2011-03-10 23:04:39 -0500
commitd7d25692cc6818daeee9d293f6d1971b6ade8a7b (patch)
treefe871a3b927a9ce96cd9a62fe3a3263d94594f6c /wrappers/emerge-wrapper
parentbusybox env: fix logic typo (diff)
downloadcrossdev-d7d25692cc6818daeee9d293f6d1971b6ade8a7b.tar.gz
crossdev-d7d25692cc6818daeee9d293f6d1971b6ade8a7b.tar.bz2
crossdev-d7d25692cc6818daeee9d293f6d1971b6ade8a7b.zip
emerge-wrapper: move files to /etc/portage/
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'wrappers/emerge-wrapper')
-rwxr-xr-xwrappers/emerge-wrapper10
1 files changed, 8 insertions, 2 deletions
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index d900784..20b32ff 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -35,9 +35,15 @@ cross_wrap_etc()
setup_warning=false
cp -a "${PREFIX}"/share/crossdev/etc ${SYSROOT}/ || return 1
- ln -sf /etc/make.globals ${SYSROOT}/etc/make.globals || return 1
+ local f
+ for f in /usr/share/portage/config/make.globals /etc/{portage/,}make.globals ; do
+ if [[ -e ${f} ]] ; then
+ ln -sf ${f} "${SYSROOT}"/etc/portage/make.globals || return 1
+ break
+ fi
+ done
- local conf=${SYSROOT}/etc/make.conf
+ local conf=${SYSROOT}/etc/portage/make.conf
# Re-use existing CHOST->portage ARCH mapping code
ARCH=$(