diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2018-01-08 16:13:29 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2018-01-08 16:52:23 +0900 |
| commit | 24468235c3e00c94ff0ae08b6e229f98cfa23a02 (patch) | |
| tree | 279ec10ae2b8e6363a7d9ab071b9bd9a0ea8168f /scripts | |
| parent | scripts/bootstrap-prefix: run bash check under LANG=C, bug #642678 (diff) | |
| download | prefix-24468235c3e00c94ff0ae08b6e229f98cfa23a02.tar.gz prefix-24468235c3e00c94ff0ae08b6e229f98cfa23a02.tar.bz2 prefix-24468235c3e00c94ff0ae08b6e229f98cfa23a02.zip | |
scripts/bootstrap-prefix.sh: do not shortcut when EPREFIX/tmp exists.
Do not put profiles into overlay.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 88f7dbcd1f..d38790b1b8 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -427,12 +427,6 @@ bootstrap_setup() { profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}} if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then local fullprofile="${PORTDIR}/profiles/${profile}" - for base in ${PORTDIR_OVERLAY} ; do - if [[ -e ${base}/profiles/${profile}/parent ]] ; then - fullprofile="${base}/profiles/${profile}" - break - fi - done ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile einfo "Your profile is set to ${fullprofile}." @@ -1138,10 +1132,11 @@ bootstrap_bzip2() { bootstrap_stage_host_gentoo() { if [[ ! -L ${ROOT}/tmp ]] ; then if [[ -e ${ROOT}/tmp ]] ; then - echo "${ROOT}/tmp should be a symlink to ${HOST_GENTOO_EROOT}" - return 1 + einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}" + einfo "Let's ignore the shortcut and continue." + else + ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp fi - ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp fi # checks itself if things need to be done still @@ -2232,7 +2227,7 @@ EOF # Figure out if we are bootstrapping from an existing Gentoo # It can be forced by setting HOST_GENTOO_EROOT manually - local t_GENTOO_EROOT=$(/usr/bin/portageq envvar EROOT 2> /dev/null) + local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null) if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then cat <<EOF |