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
cde43d61
Commit
cde43d61
authored
5 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
build-relocatable-install: Further fixes
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
92bffa62
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
build-relocatable-install.py
+40
-35
40 additions, 35 deletions
build-relocatable-install.py
with
40 additions
and
35 deletions
build-relocatable-install.py
+
40
−
35
View file @
cde43d61
...
...
@@ -156,6 +156,9 @@ def main():
args
.
prefix
=
args
.
destdir
+
args
.
prefix
args
.
srcdir
=
args
.
destdir
+
args
.
srcdir
if
args
.
archive
is
None
and
args
.
output
is
None
:
parser
.
error
(
'
Either --archive or --output is required
'
)
if
args
.
version
is
None
:
with
open
(
os
.
path
.
join
(
args
.
srcdir
,
'
.tarball-version
'
))
as
reader
:
args
.
version
=
reader
.
read
().
strip
()
...
...
@@ -207,16 +210,17 @@ def main():
v_check_call
([
'
apt-get
'
,
'
download
'
,
package
,
package
+
'
:
'
+
arch
.
name
,
],
cwd
=
tmpdir
)
v_check_call
(
'
dpkg-deb -
x
{}_*.deb build-relocatable
'
.
format
(
'
dpkg-deb -
X
{}_*
_{}
.deb build-relocatable
'
.
format
(
quote
(
package
),
quote
(
arch
.
name
),
),
cwd
=
tmpdir
,
shell
=
True
,
)
path
=
'
{}/build-relocatable/
usr/bin/TOOL
'
.
format
(
tmpdir
)
path
=
'
{}/build-relocatable/
{}
'
.
format
(
tmpdir
,
path
)
for
tool
in
LIBCAPSULE_TOOLS
:
install_exe
(
...
...
@@ -463,39 +467,40 @@ def main():
)
as
writer
:
writer
.
write
(
'
{}
\n
'
.
format
(
args
.
version
))
bin_tar
=
os
.
path
.
join
(
args
.
archive
,
'
pressure-vessel-{}-bin.tar.gz
'
.
format
(
args
.
version
),
)
src_tar
=
os
.
path
.
join
(
args
.
archive
,
'
pressure-vessel-{}-bin+src.tar.gz
'
.
format
(
args
.
version
),
)
if
args
.
archive
:
bin_tar
=
os
.
path
.
join
(
args
.
archive
,
'
pressure-vessel-{}-bin.tar.gz
'
.
format
(
args
.
version
),
)
src_tar
=
os
.
path
.
join
(
args
.
archive
,
'
pressure-vessel-{}-bin+src.tar.gz
'
.
format
(
args
.
version
),
)
subprocess
.
check_call
([
'
tar
'
,
r
'
--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,
'
.
format
(
args
.
version
,
),
'
--exclude=metadata
'
,
# this is all duplicated in sources/
'
-zcvf
'
,
src_tar
+
'
.tmp
'
,
'
-C
'
,
installation
,
'
.
'
,
])
subprocess
.
check_call
([
'
tar
'
,
r
'
--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,
'
.
format
(
args
.
version
,
),
'
--exclude=sources
'
,
'
-zcvf
'
,
bin_tar
+
'
.tmp
'
,
'
-C
'
,
installation
,
'
.
'
,
])
os
.
rename
(
bin_tar
+
'
.tmp
'
,
bin_tar
)
os
.
rename
(
src_tar
+
'
.tmp
'
,
src_tar
)
print
(
'
Generated {}
'
.
format
(
os
.
path
.
abspath
(
bin_tar
)))
print
(
'
Generated {}
'
.
format
(
os
.
path
.
abspath
(
src_tar
)))
subprocess
.
check_call
([
'
tar
'
,
r
'
--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,
'
.
format
(
args
.
version
,
),
'
--exclude=metadata
'
,
# this is all duplicated in sources/
'
-zcvf
'
,
src_tar
+
'
.tmp
'
,
'
-C
'
,
installation
,
'
.
'
,
])
subprocess
.
check_call
([
'
tar
'
,
r
'
--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,
'
.
format
(
args
.
version
,
),
'
--exclude=sources
'
,
'
-zcvf
'
,
bin_tar
+
'
.tmp
'
,
'
-C
'
,
installation
,
'
.
'
,
])
os
.
rename
(
bin_tar
+
'
.tmp
'
,
bin_tar
)
os
.
rename
(
src_tar
+
'
.tmp
'
,
src_tar
)
print
(
'
Generated {}
'
.
format
(
os
.
path
.
abspath
(
bin_tar
)))
print
(
'
Generated {}
'
.
format
(
os
.
path
.
abspath
(
src_tar
)))
if
__name__
==
'
__main__
'
:
...
...
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