From cca315f814888025daa80fc320610117a6f69007 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:49 -0300 Subject: [PATCH] utils/check-package: fix check for _REDISTRIBUTE Commit "8e87d76c12 check-package: check *.mk files" added a typo that prevents check-package from checking _REDISTRIBUTE default value. Fix the typo: _INSTALL_REDISTRIBUTE -> _REDISTRIBUTE Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/checkpackagelib/lib_mk.py | 2 +- utils/checkpackagelib/test_lib_mk.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index ce2ab5157c..4d97571f50 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -324,7 +324,7 @@ class UselessFlag(_CheckFunction): r"_LIBTOOL_PATCH\s*=\s*YES"]))) DEFAULT_GENERIC_FLAG = re.compile(r"^.*{}".format("|".join([ r"_INSTALL_IMAGES\s*=\s*NO", - r"_INSTALL_REDISTRIBUTE\s*=\s*YES", + r"_REDISTRIBUTE\s*=\s*YES", r"_INSTALL_STAGING\s*=\s*NO", r"_INSTALL_TARGET\s*=\s*YES"]))) END_CONDITIONAL = re.compile(r"^\s*({})".format("|".join(end_conditional))) diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 2086237ebb..11fecdd5cf 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -602,13 +602,13 @@ UselessFlag = [ ('generic', 'any.mk', 'ANY_INSTALL_IMAGES = NO\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n' + 'ANY_REDISTRIBUTE = YES\n' 'ANY_INSTALL_STAGING = NO\n' 'ANY_INSTALL_TARGET = YES\n', [['any.mk:1: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_IMAGES = NO\n'], ['any.mk:2: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n'], + 'ANY_REDISTRIBUTE = YES\n'], ['any.mk:3: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', 'ANY_INSTALL_STAGING = NO\n'], ['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', @@ -618,9 +618,9 @@ UselessFlag = [ 'ifneq (condition)\n' 'ANY_INSTALL_IMAGES = NO\n' 'endif\n' - 'ANY_INSTALL_REDISTRIBUTE = YES\n', + 'ANY_REDISTRIBUTE = YES\n', [['any.mk:4: useless default value (url#_infrastructure_for_packages_with_specific_build_systems)', - 'ANY_INSTALL_REDISTRIBUTE = YES\n']]), + 'ANY_REDISTRIBUTE = YES\n']]), ]