From e93afd48df3ac57bd32b26ddeca90784fc25f04f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 23 Apr 2021 16:36:43 -0400
Subject: [PATCH] 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
---
scripts/make-packaging-target.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 0e3b9c17..88741cac 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -269,14 +269,12 @@ def run_generate_all(parsed_args):
},
{
"distribution": "ubuntu_21.04",
- "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default",
},
{
"distribution": "ubuntu_21.04_oci",
"docker_image": "ubuntu_21.04",
- "debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
@@ -295,7 +293,6 @@ def run_generate_all(parsed_args):
},
{
"distribution": "fedora_34",
- "debian_packaging_override": "",
"output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
},
--
GitLab