* [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking
@ 2019-07-15 6:52 Jerzy Grzegorek
2019-07-15 20:34 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Jerzy Grzegorek @ 2019-07-15 6:52 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
---
utils/checkpackagelib/lib_config.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index f0edb9993d..a135355f9a 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -72,8 +72,8 @@ class CommentsMenusPackagesOrder(_CheckFunction):
return len(self.state.split('-')) - 1
def check_line(self, lineno, text):
- if text.startswith("comment") or text.startswith("if") or \
- text.startswith("menu"):
+ if text.startswith("comment ") or text.startswith("if ") or \
+ text.startswith("menu "):
if text.startswith("comment"):
if not self.state.endswith("-comment"):
@@ -103,7 +103,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
elif text.startswith('\tsource "package/'):
level = self.get_level()
- new_package = text[17: -(len(self.filename)-5):]
+ new_package = text[17: -(len(self.filename)-self.filename.index("Config")+3):]
# We order _ before A, so replace it with .
new_package_ord = new_package.replace('_', '.')
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking
2019-07-15 6:52 [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking Jerzy Grzegorek
@ 2019-07-15 20:34 ` Yann E. MORIN
2019-07-16 20:56 ` Jerzy Grzegorek
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2019-07-15 20:34 UTC (permalink / raw)
To: buildroot
Jerzy, All,
On 2019-07-15 08:52 +0200, Jerzy Grzegorek spake thusly:
> Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
Please provide more information in the commit log. See below...
> ---
> utils/checkpackagelib/lib_config.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
> index f0edb9993d..a135355f9a 100644
> --- a/utils/checkpackagelib/lib_config.py
> +++ b/utils/checkpackagelib/lib_config.py
> @@ -72,8 +72,8 @@ class CommentsMenusPackagesOrder(_CheckFunction):
> return len(self.state.split('-')) - 1
>
> def check_line(self, lineno, text):
> - if text.startswith("comment") or text.startswith("if") or \
> - text.startswith("menu"):
> + if text.startswith("comment ") or text.startswith("if ") or \
> + text.startswith("menu "):
I guess this superseds Arnout's own patch?
http://lists.busybox.net/pipermail/buildroot/2019-July/254466.html
> if text.startswith("comment"):
> if not self.state.endswith("-comment"):
> @@ -103,7 +103,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
>
> elif text.startswith('\tsource "package/'):
> level = self.get_level()
> - new_package = text[17: -(len(self.filename)-5):]
> + new_package = text[17: -(len(self.filename)-self.filename.index("Config")+3):]
I fail to see how the two changes are related. This should be explained
in the commit log. If they are not fixing the same thing, it should be
two commits.
Regards,
Yann E. MORIN.
> # We order _ before A, so replace it with .
> new_package_ord = new_package.replace('_', '.')
> --
> 2.17.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking
2019-07-15 20:34 ` Yann E. MORIN
@ 2019-07-16 20:56 ` Jerzy Grzegorek
0 siblings, 0 replies; 3+ messages in thread
From: Jerzy Grzegorek @ 2019-07-16 20:56 UTC (permalink / raw)
To: buildroot
Hi Yann,
> Jerzy, All,
>
> On 2019-07-15 08:52 +0200, Jerzy Grzegorek spake thusly:
>> Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
> Please provide more information in the commit log. See below...
>
>> ---
>> utils/checkpackagelib/lib_config.py | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
>> index f0edb9993d..a135355f9a 100644
>> --- a/utils/checkpackagelib/lib_config.py
>> +++ b/utils/checkpackagelib/lib_config.py
>> @@ -72,8 +72,8 @@ class CommentsMenusPackagesOrder(_CheckFunction):
>> return len(self.state.split('-')) - 1
>>
>> def check_line(self, lineno, text):
>> - if text.startswith("comment") or text.startswith("if") or \
>> - text.startswith("menu"):
>> + if text.startswith("comment ") or text.startswith("if ") or \
>> + text.startswith("menu "):
> I guess this superseds Arnout's own patch?
> http://lists.busybox.net/pipermail/buildroot/2019-July/254466.html
Ah yes, actually.
This change filters out lines starting with e.g.
menuconfig ...
from those starting with
menu "...
Only lines starting with "comment ", "if " or "menu " build new state
to track the depth of menus and conditions.
>
>> if text.startswith("comment"):
>> if not self.state.endswith("-comment"):
>> @@ -103,7 +103,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
>>
>> elif text.startswith('\tsource "package/'):
>> level = self.get_level()
>> - new_package = text[17: -(len(self.filename)-5):]
>> + new_package = text[17: -(len(self.filename)-self.filename.index("Config")+3):]
> I fail to see how the two changes are related. This should be explained
> in the commit log. If they are not fixing the same thing, it should be
> two commits.
This one only took into account files: package/Config.in and
package/Config.in.host .
In case of file package/kodi/Config.in packages' names in lines have
been cut off to much:
\tsource "package/kodi-audiodecoder-modplug/Config.in" ->
kodi-audiodecoder-mo
\tsource "package/kodi-audiodecoder-nosefart/Config.in" ->
kodi-audiodecoder-nos
\tsource "package/kodi-audiodecoder-opus/Config.in" -> kodi-audiodecoder
...
and after comparing it caused an issue.
Thanks for the review.
Regards,
Jerzy
>
> Regards,
> Yann E. MORIN.
>
>> # We order _ before A, so replace it with .
>> new_package_ord = new_package.replace('_', '.')
>> --
>> 2.17.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-16 20:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-15 6:52 [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking Jerzy Grzegorek
2019-07-15 20:34 ` Yann E. MORIN
2019-07-16 20:56 ` Jerzy Grzegorek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox