diff --git a/crossdev b/crossdev index 020d17c..4775ae7 100755 --- a/crossdev +++ b/crossdev @@ -897,6 +897,7 @@ SHOW_FAIL_LOG="no" SHOW_TARGET_CFG="no" INIT_TARGET_ONLY="no" LLVM="no" +PROFILE="embedded" while [[ $# -gt 0 ]] ; do case $1 in @@ -939,6 +940,7 @@ while [[ $# -gt 0 ]] ; do --cpkg) shift; CPKG=$1;; -ox|--ov-extra) shift; XOVLS+=( "$1" );; --env) shift; AENV=$1;; + --profile) shift; PROFILE=$1;; -L|--llvm) LLVM="yes";; -A|--abis) shift; MULTILIB_ABIS=$1;; --host-abi) shift; HOST_ABI=$1;; @@ -1557,7 +1559,7 @@ hr ### Create links for helper scripts ### xmkdir -p "${EPREFIX}"/usr/${CTARGET} -LLVM="${LLVM}" emerge-wrapper --target ${CTARGET} --init || exit 1 +LLVM="${LLVM}" emerge-wrapper --target ${CTARGET} --init --profile ${PROFILE} || exit 1 ############################################################# ### Create directories usually created by sys-apps/baselayout diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 79c182e..8ec2ffd 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -37,7 +37,6 @@ cross_wrap_etc() setup_warning=false cp -a "${PREFIX}"/share/crossdev/etc ${SYSROOT}/ || return 1 - ln -snf "${MAIN_REPO_PATH}/profiles/embedded" "${SYSROOT}/etc/portage/make.profile" || return 1 local confs=( ${SYSROOT}/etc/portage/make.conf @@ -107,6 +106,8 @@ cross_wrap_etc() EOF fi + PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force ${PROFILE} + return 0 } @@ -159,12 +160,18 @@ CHOST=${CHOST%-emerge} CHOST=${CHOST#emerge-} export CHOST +PROFILE="embedded" + if [[ $1 == "--target" ]] ; then CHOST=$2 shift 2 fi if [[ $1 == "--init" ]] ; then + shift + if [[ $1 == "--profile" ]] ; then + PROFILE=$2 + fi cross_init exit $? fi