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

base: Allow a specific debootstrap script to be forced

parent 67a6e40c
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ def main() -> None: ...@@ -32,6 +32,7 @@ def main() -> None:
parser.add_argument('--include', default='') parser.add_argument('--include', default='')
parser.add_argument('--keyring-file', default='') parser.add_argument('--keyring-file', default='')
parser.add_argument('--merged-usr', action='store_true', default=None) parser.add_argument('--merged-usr', action='store_true', default=None)
parser.add_argument('--script', default='')
parser.add_argument('suite') parser.add_argument('suite')
parser.add_argument('sysroot') parser.add_argument('sysroot')
parser.add_argument('mirror') parser.add_argument('mirror')
...@@ -66,6 +67,9 @@ def main() -> None: ...@@ -66,6 +67,9 @@ def main() -> None:
argv.append(args.sysroot) argv.append(args.sysroot)
argv.append(args.mirror) argv.append(args.mirror)
if args.script:
argv.append(args.script)
try: try:
subprocess.check_call(argv) subprocess.check_call(argv)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
......
...@@ -13,6 +13,7 @@ SPDX-License-Identifier: MIT ...@@ -13,6 +13,7 @@ SPDX-License-Identifier: MIT
{{- $keyring := or .keyring "" -}} {{- $keyring := or .keyring "" -}}
{{- $additional_base_packages := or .additional_base_packages "" -}} {{- $additional_base_packages := or .additional_base_packages "" -}}
{{- $build_id := or .build_id "" -}} {{- $build_id := or .build_id "" -}}
{{- $debootstrap_script := or .debootstrap_script "" -}}
{{- $exclude := or .exclude "" -}} {{- $exclude := or .exclude "" -}}
{{- $include := or .include "" -}} {{- $include := or .include "" -}}
{{- $variant := or .variant "Minimal base system" -}} {{- $variant := or .variant "Minimal base system" -}}
...@@ -43,9 +44,10 @@ actions: ...@@ -43,9 +44,10 @@ actions:
set -e set -e
"$RECIPEDIR/debootstrap" \ "$RECIPEDIR/debootstrap" \
--components "{{ $components }}" \ --components "{{ $components }}" \
--include "{{ $include }}" \
--exclude "{{ $exclude }}" \ --exclude "{{ $exclude }}" \
--include "{{ $include }}" \
--keyring-file "{{ $keyring }}" \ --keyring-file "{{ $keyring }}" \
--script "{{ $debootstrap_script }}" \
"{{ $suite }}" \ "{{ $suite }}" \
"$ROOTDIR" \ "$ROOTDIR" \
"{{ $mirror }}" "{{ $mirror }}"
......
...@@ -1111,6 +1111,11 @@ class Builder: ...@@ -1111,6 +1111,11 @@ class Builder:
argv.append('-t') argv.append('-t')
argv.append('include:{}'.format(','.join(include))) argv.append('include:{}'.format(','.join(include)))
script = self.suite_details.get('debootstrap_script')
if script:
argv.append('-t')
argv.append(f'debootstrap_script:{script}')
add_pkgs = self.suite_details.get('additional_base_packages') add_pkgs = self.suite_details.get('additional_base_packages')
if add_pkgs: if add_pkgs:
argv.append('-t') argv.append('-t')
......
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