aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch')
-rw-r--r--mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch b/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch
deleted file mode 100644
index da6e2166b..000000000
--- a/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 17 Oct 2017 18:21:07 +0200
-Subject: [PATCH] PDF: generate_config: Fix abspath for '-j' arg
-
-Change-Id: I8a9076e7965bfd2bee7d298eb8e3b11e62ae66e7
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- config/utils/generate_config.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py
-index 18af98d..22a27d3 100755
---- a/config/utils/generate_config.py
-+++ b/config/utils/generate_config.py
-@@ -38,7 +38,7 @@ def dpkg_arch(arch, to_dpkg=True):
- else:
- return ARCH_DPKG_TABLE[arch]
-
--ENV = Environment(loader=FileSystemLoader('./'))
-+ENV = Environment(loader=FileSystemLoader(os.path.dirname(ARGS.jinja2)))
- ENV.filters['ipaddr_index'] = ipaddr_index
- ENV.filters['dpkg_arch'] = dpkg_arch
-
-@@ -56,6 +56,6 @@ if os.path.exists(IDF_PATH):
- # print(DICT)
-
- # Render template and print generated conf to console
--TEMPLATE = ENV.get_template(ARGS.jinja2)
-+TEMPLATE = ENV.get_template(os.path.basename(ARGS.jinja2))
- #pylint: disable=superfluous-parens
- print(TEMPLATE.render(conf=DICT))