diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-18 11:52:12 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-18 11:53:41 -0400 |
| commit | ed6c54d9c660286fb1d0620e4c7f7ff00b642b57 (patch) | |
| tree | 40a3d26c6befb0664143cd30c1fc9f28e43cf785 /wrappers/emerge-wrapper | |
| parent | crossdev: switch nios to mainline packages (diff) | |
| download | crossdev-ed6c54d9c660286fb1d0620e4c7f7ff00b642b57.tar.gz crossdev-ed6c54d9c660286fb1d0620e4c7f7ff00b642b57.tar.bz2 crossdev-ed6c54d9c660286fb1d0620e4c7f7ff00b642b57.zip | |
crossdev/emerge-wrapper: merge repos.conf parsers
The crossdev code had a more full-featured parser of the repos.conf output
than the emerge-wrapper. The latter failed to include the last overlay in
the list leading to ugly warnings like:
/usr/bin/emerge-wrapper: line 48: /eclass/toolchain-funcs.eclass: No such file or directory
/usr/bin/emerge-wrapper: line 49: tc-arch: command not found
URL: https://bugs.gentoo.org/546748
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'wrappers/emerge-wrapper')
| -rwxr-xr-x | wrappers/emerge-wrapper | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 4056601..e375025 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -116,20 +116,7 @@ import_vars="DISTDIR MAKEOPTS GENTOO_MIRRORS" eval $(portageq envvar -v CBUILD ${import_vars}) export CBUILD -# Probably shouldn't hardcode "gentoo" here. -MAIN_REPO_PATH=$(portageq repositories_configuration / | gawk ' - { - if ($1 == "main-repo") { - main_repo = $NF - } else if ($1 ~ /^\[/) { - locs[repo_name] = loc - repo_name = gensub(/\[([^\]]*)\]/, "\\1", "", $1) - } else if ($1 == "location") { - loc = $3 - } - } - END { print(locs[main_repo]) } -') +MAIN_REPO_PATH=$(crossdev --show-repo-cfg MAIN_REPO_PATH) # Get default CHOST value from program name CHOST=${0##*/} |