Skip to content
Snippets Groups Projects
Commit a7e115c2 authored by Simon McVittie's avatar Simon McVittie
Browse files

run: Generalize handling of pre_apt_script and post_script

parent f1d87822
No related branches found
No related tags found
1 merge request!22Draft: runtimes: Configure runtime overlay apt source, and upgrade Platform to it
...@@ -1840,33 +1840,20 @@ class Builder: ...@@ -1840,33 +1840,20 @@ class Builder:
with open(dest, 'w', encoding='utf-8') as writer: with open(dest, 'w', encoding='utf-8') as writer:
yaml.safe_dump(packages, stream=writer) yaml.safe_dump(packages, stream=writer)
script = self.runtime_details.get('post_script', '') for script_name in ('pre_apt_script', 'post_script'):
script = self.runtime_details.get(script_name, '')
if script: if script:
dest = os.path.join(scratch, 'post_script') dest = os.path.join(scratch, script_name)
with open(dest, 'w', encoding='utf-8') as writer:
writer.write('#!/bin/sh\n')
writer.write(script)
writer.write('\n')
os.chmod(dest, 0o755)
argv.append('-t')
argv.append('post_script:post_script')
pre_apt_script = self.runtime_details.get('pre_apt_script', '')
if pre_apt_script:
dest = os.path.join(scratch, 'pre_apt_script')
with open(dest, 'w', encoding='utf-8') as writer: with open(dest, 'w', encoding='utf-8') as writer:
writer.write('#!/bin/sh\n') writer.write('#!/bin/sh\n')
writer.write(pre_apt_script) writer.write(script)
writer.write('\n') writer.write('\n')
os.chmod(dest, 0o755) os.chmod(dest, 0o755)
argv.append('-t') argv.append('-t')
argv.append('pre_apt_script:pre_apt_script') argv.append('{}:{}'.format(script_name, script_name))
if sdk: if sdk:
sources_tarball = sources_prefix + '.tar.gz' sources_tarball = sources_prefix + '.tar.gz'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment