New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[modes] obs-rpm-build+pp: Fix tools prefix priority more. JB#58627 #16
Conversation
When there is no separate tools root, i.e., 'tools' == '/', the original rule catches everything. The 'obs-rpm-build' mode (without +pp) already does just this. This fixes commit b730a32. Signed-off-by: Martin Kampas <martin.kampas@jolla.com>
|
I think bafdfe9 should be changed so tools is always set . |
|
@Thaodan I don't follow, please explain more what you mean. Unless I missed something |
It's set to "" when tools_root is "/", which is empty. If ignore that check it should be fine. |
|
Hm, maybe I am still missing something? scratchbox2/lua_scripts/init.lua Lines 77 to 85 in c9fb642
tools is set to tools_root unless tools_root is unset (or empty), in which case tools is set to "/". So tools is always set and never empty.
|
Yes you are right but in such as case setting the prefix to tools root would set it to be empty? |
|
Do you mean that |
I mean that tools should be set to tools_root if tool is empty so has the same content as when you set prefix to tools_root. |
|
I am afraid I still don't follow your concerns. Line 144 in c9fb642
tools_root variable holds the raw value, the tools and tools_prefix variables are set so that they can be used irrespective of the fact whether a separate tools root is used or not.
|
|
I am afraid I still don't follow your concerns. `tools` is the effective path to the tools tree. Tools tree may be either a separate tree (called tooling inside SDK) or the host root is used as the tools root (this is how OBS uses sb2). In the former case `tools_root` is set, in the latter case `tools_root` is empty/unset https://github.com/sailfishos/scratchbox2/blob/c9fb642ab6da025140532b1afbf8a1eca630e84c/utils/sb2-init#L144. While the `tools_root` variable holds the raw value, the `tools` and `tools_prefix` variables are set so that they can be used irrespective of the fact whether a separate tools root is used or not.
That is what I mean since the obs uses tools_root tools should be set to to tools root when tools is empty. Now tools is unused and can be removed or used to unify both.
I assumed that the rules above are only for python and Perl while the line you changed is for the rest.
|
OBS does not use
The rules above do not match - the interpreter is located under build target. The line I changed matched everything, because |
No description provided.