From 71075d441a9fe5219c85a3469a4d3836a79149d0 Mon Sep 17 00:00:00 2001 From: Mehmet Basaran Date: Sun, 15 Jun 2025 10:34:06 +0300 Subject: [PATCH] UBUNTU: [Packaging] update annotations scripts BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Mehmet Basaran --- debian/scripts/misc/annotations | 1 + debian/scripts/misc/kconfig/annotations.py | 3 +-- debian/scripts/misc/kconfig/run.py | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/scripts/misc/annotations b/debian/scripts/misc/annotations index 3a05fe96343e..6c1cf810ff4b 100755 --- a/debian/scripts/misc/annotations +++ b/debian/scripts/misc/annotations @@ -18,6 +18,7 @@ import sys sys.dont_write_bytecode = True import os # noqa: E402 Import not at top of file + from kconfig import run # noqa: E402 Import not at top of file diff --git a/debian/scripts/misc/kconfig/annotations.py b/debian/scripts/misc/kconfig/annotations.py index 43c8cdf399ad..5f34410d4ef8 100644 --- a/debian/scripts/misc/kconfig/annotations.py +++ b/debian/scripts/misc/kconfig/annotations.py @@ -6,10 +6,9 @@ import json import re import shutil import tempfile - from abc import abstractmethod from ast import literal_eval -from os.path import dirname, abspath +from os.path import abspath, dirname from kconfig.version import ANNOTATIONS_FORMAT_VERSION diff --git a/debian/scripts/misc/kconfig/run.py b/debian/scripts/misc/kconfig/run.py index 63b0c9435a5c..1f3e6abe7e53 100644 --- a/debian/scripts/misc/kconfig/run.py +++ b/debian/scripts/misc/kconfig/run.py @@ -2,11 +2,11 @@ # Manage Ubuntu kernel .config and annotations # Copyright © 2022 Canonical Ltd. -import sys -import os import argparse import json -from signal import signal, SIGPIPE, SIG_DFL +import os +import sys +from signal import SIG_DFL, SIGPIPE, signal try: from argcomplete import autocomplete @@ -17,9 +17,8 @@ except ModuleNotFoundError: from kconfig.annotations import Annotation, KConfig # noqa: E402 Import not at top of file -from kconfig.utils import autodetect_annotations, arg_fail # noqa: E402 Import not at top of file -from kconfig.version import VERSION, ANNOTATIONS_FORMAT_VERSION # noqa: E402 Import not at top of file - +from kconfig.utils import arg_fail, autodetect_annotations # noqa: E402 Import not at top of file +from kconfig.version import ANNOTATIONS_FORMAT_VERSION, VERSION # noqa: E402 Import not at top of file SKIP_CONFIGS = ( # CONFIG_VERSION_SIGNATURE is dynamically set during the build