Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
949e6efb
Commit
949e6efb
authored
3 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
sysroot: Cope with builddir being a symlink to elsewhere
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
393bb134
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitignore
+1
-2
1 addition, 2 deletions
.gitignore
sysroot/run-in-sysroot.py
+11
-2
11 additions, 2 deletions
sysroot/run-in-sysroot.py
with
12 additions
and
4 deletions
.gitignore
+
1
−
2
View file @
949e6efb
.*.sw?
/.mypy_cache
/_build*/
/_build/
/_build*
/build/
/builddir/
/helpers/_generated_*/
...
...
This diff is collapsed.
Click to expand it.
sysroot/run-in-sysroot.py
+
11
−
2
View file @
949e6efb
...
...
@@ -55,6 +55,7 @@ def main():
abs_srcdir
=
os
.
path
.
abspath
(
args
.
srcdir
)
abs_builddir
=
os
.
path
.
abspath
(
args
.
builddir
)
real_builddir
=
os
.
path
.
realpath
(
args
.
builddir
)
if
args
.
sysroot
is
None
:
args
.
sysroot
=
os
.
path
.
join
(
abs_builddir
,
'
sysroot
'
)
...
...
@@ -93,7 +94,7 @@ def main():
os
.
makedirs
(
os
.
path
.
join
(
abs_sysroot
,
'
./
'
+
abs_srcdir
),
exist_ok
=
True
)
os
.
makedirs
(
os
.
path
.
join
(
abs_sysroot
,
'
./
'
+
abs
_builddir
),
exist_ok
=
True
)
os
.
path
.
join
(
abs_sysroot
,
'
./
'
+
real
_builddir
),
exist_ok
=
True
)
argv
=
[
'
bwrap
'
,
...
...
@@ -113,9 +114,17 @@ def main():
'
--tmpfs
'
,
'
/run
'
,
'
--tmpfs
'
,
'
/run/host
'
,
'
--bind
'
,
abs_srcdir
,
abs_srcdir
,
'
--bind
'
,
abs
_builddir
,
abs
_builddir
,
'
--bind
'
,
real
_builddir
,
real
_builddir
,
]
if
(
real_builddir
!=
abs_builddir
and
os
.
path
.
commonpath
([
abs_builddir
,
abs_srcdir
])
!=
abs_srcdir
):
argv
.
extend
([
'
--symlink
'
,
real_builddir
,
abs_builddir
,
])
for
var
in
(
'
AUTOPKGTEST_ARTIFACTS
'
,
'
DESTDIR
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment