Initial support for overriding profile #22
Conversation
chewi
left a comment
chewi
left a comment
There was a problem hiding this comment.
We need the S-o-b footer in the commit.
Thanks, this is a nice addition. I've thought for a while that crossdev should try to pick a good default profile as embedded is almost never what you want, but this is still useful regardless.
| 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.
| PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force ${PROFILE} | |
| PORTAGE_CONFIGROOT=${SYSROOT} eselect profile set --force "${PROFILE}" |
There was a problem hiding this comment.
As discussed, I'm handling these changes now, but for the record, I'm going to move this line to cross_wrap so that it runs unconditionally. I think --force makes sense, but it's ineffective with the line where it is.
|
|
||
| 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.
| LLVM="${LLVM}" emerge-wrapper --target ${CTARGET} --init --profile ${PROFILE} || exit 1 | |
| LLVM="${LLVM}" emerge-wrapper --target "${CTARGET}" --init --profile "${PROFILE}" || exit 1 |
| --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.
|
See also https://bugs.gentoo.org/748975. |
Closes: https://bugs.gentoo.org/748975 Closes: gentoo#22 Signed-off-by: James Le Cuirot <[email protected]>
|
Please close this in favour of #32, which includes the same changes. |
Closes: https://bugs.gentoo.org/748975 Closes: gentoo#22 Signed-off-by: James Le Cuirot <[email protected]>
3 participants
If the profile is merge-usr things will fail later because crossdev baselayout is different.