From 6a5ce15fc01ef0adf7a074e3527ea6372a44c473 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 14 Dec 2022 22:15:09 +0100 Subject: [PATCH] package/ifupdown2: use older version of python-mako for now This is a workaround for the following code in ifupdown/template.py:37 that throw the exception with python-mako >= 1.2.0: try: self.logger.debug('setting template lookuppath to %s' template_lookuppath) lc = utils.importName('mako.lookup', 'TemplateLookup') self.tclassargs['lookup'] = lc( directories=template_lookuppath.split(':')) except Exception as e: self.logger.warning('unable to set template lookup path' ' %s (%s): are you sure \'python3-mako\'' 'is installed?' % (template_lookuppath, str(e))) Signed-off-by: Joachim Wiberg --- package/Config.in | 1 + package/ifupdown2/Config.in | 2 +- package/ifupdown2/ifupdown2.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/Config.in b/package/Config.in index 865b9d20..889af08e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1,5 +1,6 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/finit/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown2/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/mdnsd/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/python-templating/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/querierd/Config.in" diff --git a/package/ifupdown2/Config.in b/package/ifupdown2/Config.in index ab59b23c..2f6c4e35 100644 --- a/package/ifupdown2/Config.in +++ b/package/ifupdown2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_IFUPDOWN2 bool "ifupdown2" select BR2_PACKAGE_IPROUTE2 select BR2_PACKAGE_PYTHON3 # need, e.g., xml - select BR2_PACKAGE_PYTHON_MAKO # runtime + select BR2_PACKAGE_PYTHON_TEMPLATING # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help diff --git a/package/ifupdown2/ifupdown2.mk b/package/ifupdown2/ifupdown2.mk index 9fd67dbe..ec8f2fa4 100644 --- a/package/ifupdown2/ifupdown2.mk +++ b/package/ifupdown2/ifupdown2.mk @@ -8,7 +8,7 @@ IFUPDOWN2_VERSION = a97d3e0cf96ab44e1e37a5940c83ea390f6656c7 IFUPDOWN2_SITE = $(call github,kernelkit,ifupdown2,$(IFUPDOWN2_VERSION)) IFUPDOWN2_LICENSE = GPL-2.0+ IFUPDOWN2_LICENSE_FILES = LICENSE -IFUPDOWN2_DEPENDENCIES = iproute2 python3 python-mako python-six python-setuptools +IFUPDOWN2_DEPENDENCIES = iproute2 python3 python-templating python-six python-setuptools IFUPDOWN2_SETUP_TYPE = setuptools $(eval $(python-package))