Initial support for overriding profile #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chewi
suggested changes
Sep 22, 2024
| @@ -107,6 +106,8 @@ cross_wrap_etc() | |||
| EOF | |||
| fi | |||
|
|
|||
| PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force ${PROFILE} | |||
There was a problem hiding this comment.
I was going to suggest setting ROOT=/usr/${CHOST} and EPREFIX= instead, but looking at how profile.eselect works, I think what you have is correct because the repos are not configured under /usr/${CHOST}/etc/portage.
It's slightly brittle in that it relies on profile.eselect calling portageq get_repo_path "${EROOT:-/}" and portageq get_repo_path (thankfully) ignoring PORTAGE_CONFIGROOT, but that's what we have to work with.
But it is probably best to quote PROFILE here.
Suggested change
| PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force ${PROFILE} | |
| PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force "${PROFILE}" |
| @@ -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 | |||
There was a problem hiding this comment.
Please also quote here, include CTARGET while you're at it.
Suggested change
| LLVM="${LLVM}" emerge-wrapper --target ${CTARGET} --init --profile ${PROFILE} || exit 1 | |
| LLVM="${LLVM}" emerge-wrapper --target "${CTARGET}" --init --profile "${PROFILE}" || exit 1 |
| @@ -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;; | |||
There was a problem hiding this comment.
It's hard to tell in GitHub, but I think your whitespace is off here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the profile is merge-usr things will fail later because crossdev baselayout is different.