Unverified Commit e93afd48 authored by Maxim Cournoyer's avatar Maxim Cournoyer Committed by Maxim Cournoyer
Browse files

maint: Remove debian_packaging_override arguments.

These are no longer supported by the script and cause errors.

* scripts/make-packaging-target.py (run_generate_all)
[debian_packaging_override]: Remove arguments.

Change-Id: I5211a8f6e67cd52e1e1a136acf1e58fbe37ec76b
parent 6d0caec2
...@@ -269,14 +269,12 @@ def run_generate_all(parsed_args): ...@@ -269,14 +269,12 @@ def run_generate_all(parsed_args):
}, },
{ {
"distribution": "ubuntu_21.04", "distribution": "ubuntu_21.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "ubuntu_21.04_oci", "distribution": "ubuntu_21.04_oci",
"docker_image": "ubuntu_21.04", "docker_image": "ubuntu_21.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
...@@ -295,7 +293,6 @@ def run_generate_all(parsed_args): ...@@ -295,7 +293,6 @@ def run_generate_all(parsed_args):
}, },
{ {
"distribution": "fedora_34", "distribution": "fedora_34",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment