* [Buildroot] [PATCH/next v2, 1/1] utils/checkpackagelib/lib_mk.py: check typo in define
@ 2021-11-29 6:16 Fabrice Fontaine
2021-12-06 21:24 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-11-29 6:16 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Ricardo Martincoski
Check typo in define to detect SMAKE_LINUX_CONFIG_FIXUPS in smack
(fixed by 41e2132fbe8a8fc237ca4a2cd2eff9bd9ced09a6)
The new expression will catch "SMAKE_CONF_OPTS" as well as
"define SMAKE_LINUX_CONFIG_FIXUPS"
Two modifications were made:
- add (define\s+)? which will match "define " but also an empty value.
Thanks to this, the second group will always contain the variable
name.
- remove \s*(\+|)= which seems superfluous
Also, add GCC_TARGET in ALLOWED variable to avoid the following
warnings:
arch/arch.mk:12: possible typo: GCC_TARGET_ARCH -> *ARCH*
arch/arch.mk:13: possible typo: GCC_TARGET_ABI -> *ARCH*
arch/arch.mk:14: possible typo: GCC_TARGET_NAN -> *ARCH*
arch/arch.mk:15: possible typo: GCC_TARGET_FP32_MODE -> *ARCH*
arch/arch.mk:16: possible typo: GCC_TARGET_CPU -> *ARCH*
arch/arch.mk:17: possible typo: GCC_TARGET_FPU -> *ARCH*
arch/arch.mk:18: possible typo: GCC_TARGET_FLOAT_ABI -> *ARCH*
arch/arch.mk:19: possible typo: GCC_TARGET_MODE -> *ARCH*
Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Arnout Vandecappelle and Ricardo
Martincoski):
- Update commit message
- Replace " " by "\s+"
utils/checkpackagelib/lib_mk.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index d09922f724..a304f71fd5 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -236,6 +236,7 @@ class TypoInPackageVariable(_CheckFunction):
"BR_CCACHE_INITIAL_SETUP",
"BR_LIBC",
"BR_NO_CHECK_HASH_FOR",
+ "GCC_TARGET",
"LINUX_EXTENSIONS",
"LINUX_POST_PATCH_HOOKS",
"LINUX_TOOLS",
@@ -248,7 +249,7 @@ class TypoInPackageVariable(_CheckFunction):
"TARGET_FINALIZE_HOOKS",
"TARGETS_ROOTFS",
"XTENSA_CORE_NAME"]))
- VARIABLE = re.compile(r"^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=")
+ VARIABLE = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)")
def before(self):
package, _ = os.path.splitext(os.path.basename(self.filename))
@@ -258,7 +259,7 @@ class TypoInPackageVariable(_CheckFunction):
# linux extensions do not use LINUX_EXT_ prefix for variables
package = package.replace("LINUX_EXT_", "")
self.package = package
- self.REGEX = re.compile(r"^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
+ self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
self.FIND_VIRTUAL = re.compile(
r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
self.virtual = []
@@ -268,7 +269,7 @@ class TypoInPackageVariable(_CheckFunction):
if m is None:
return
- variable = m.group(1)
+ variable = m.group(2)
# allow to set variables for virtual package this package provides
v = self.FIND_VIRTUAL.search(text)
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH/next v2, 1/1] utils/checkpackagelib/lib_mk.py: check typo in define
2021-11-29 6:16 [Buildroot] [PATCH/next v2, 1/1] utils/checkpackagelib/lib_mk.py: check typo in define Fabrice Fontaine
@ 2021-12-06 21:24 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2021-12-06 21:24 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Ricardo Martincoski
On 29/11/2021 07:16, Fabrice Fontaine wrote:
> Check typo in define to detect SMAKE_LINUX_CONFIG_FIXUPS in smack
> (fixed by 41e2132fbe8a8fc237ca4a2cd2eff9bd9ced09a6)
>
> The new expression will catch "SMAKE_CONF_OPTS" as well as
> "define SMAKE_LINUX_CONFIG_FIXUPS"
>
> Two modifications were made:
> - add (define\s+)? which will match "define " but also an empty value.
> Thanks to this, the second group will always contain the variable
> name.
> - remove \s*(\+|)= which seems superfluous
It wasn't entirely superfluous - without it, you're relying on the fact that
it's not idented but it is capitalized to parse it as an assignment. But I guess
that's OK.
Applied to master, thanks.
Regards,
Arnout
>
> Also, add GCC_TARGET in ALLOWED variable to avoid the following
> warnings:
>
> arch/arch.mk:12: possible typo: GCC_TARGET_ARCH -> *ARCH*
> arch/arch.mk:13: possible typo: GCC_TARGET_ABI -> *ARCH*
> arch/arch.mk:14: possible typo: GCC_TARGET_NAN -> *ARCH*
> arch/arch.mk:15: possible typo: GCC_TARGET_FP32_MODE -> *ARCH*
> arch/arch.mk:16: possible typo: GCC_TARGET_CPU -> *ARCH*
> arch/arch.mk:17: possible typo: GCC_TARGET_FPU -> *ARCH*
> arch/arch.mk:18: possible typo: GCC_TARGET_FLOAT_ABI -> *ARCH*
> arch/arch.mk:19: possible typo: GCC_TARGET_MODE -> *ARCH*
>
> Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Arnout Vandecappelle and Ricardo
> Martincoski):
> - Update commit message
> - Replace " " by "\s+"
>
> utils/checkpackagelib/lib_mk.py | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
> index d09922f724..a304f71fd5 100644
> --- a/utils/checkpackagelib/lib_mk.py
> +++ b/utils/checkpackagelib/lib_mk.py
> @@ -236,6 +236,7 @@ class TypoInPackageVariable(_CheckFunction):
> "BR_CCACHE_INITIAL_SETUP",
> "BR_LIBC",
> "BR_NO_CHECK_HASH_FOR",
> + "GCC_TARGET",
> "LINUX_EXTENSIONS",
> "LINUX_POST_PATCH_HOOKS",
> "LINUX_TOOLS",
> @@ -248,7 +249,7 @@ class TypoInPackageVariable(_CheckFunction):
> "TARGET_FINALIZE_HOOKS",
> "TARGETS_ROOTFS",
> "XTENSA_CORE_NAME"]))
> - VARIABLE = re.compile(r"^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=")
> + VARIABLE = re.compile(r"^(define\s+)?([A-Z0-9_]+_[A-Z0-9_]+)")
>
> def before(self):
> package, _ = os.path.splitext(os.path.basename(self.filename))
> @@ -258,7 +259,7 @@ class TypoInPackageVariable(_CheckFunction):
> # linux extensions do not use LINUX_EXT_ prefix for variables
> package = package.replace("LINUX_EXT_", "")
> self.package = package
> - self.REGEX = re.compile(r"^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
> + self.REGEX = re.compile(r"(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
> self.FIND_VIRTUAL = re.compile(
> r"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
> self.virtual = []
> @@ -268,7 +269,7 @@ class TypoInPackageVariable(_CheckFunction):
> if m is None:
> return
>
> - variable = m.group(1)
> + variable = m.group(2)
>
> # allow to set variables for virtual package this package provides
> v = self.FIND_VIRTUAL.search(text)
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-06 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-29 6:16 [Buildroot] [PATCH/next v2, 1/1] utils/checkpackagelib/lib_mk.py: check typo in define Fabrice Fontaine
2021-12-06 21:24 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.