Skip to contentSkip to conversation

convert-overrides.py: also convert comments without a leading whitespace

PATCH Superseded Chen Qi 3 participants 6 messages Aug 6, 2021 – Aug 9, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/2 convert-overrides.py: also convert comments without a leading whitespace

Currently lines like below are converted.
e.g.
# IMAGE_INSTALL_append = " A"

But lines without a leading whitespace are not converted.
e.g.
#IMAGE_INSTALL_append = " A"

We should be converting both.

---
 scripts/contrib/convert-overrides.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/contrib/convert-overrides.py +3 -3
index e4a310d1d6..4d41a4c475 100755
@@ -69,15 +69,15 @@ packagevars = packagevars + imagevars
 
 vars_re = {}
 for exp in vars:
-    vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp)
+    vars_re[exp] = (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp)
 
 shortvars_re = {}
 for exp in shortvars:
-    shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")
+    shortvars_re[exp] = (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")
 
 package_re = {}
 for exp in packagevars:
-    package_re[exp] = (re.compile('(^|[\'"\s\-\+]+)' + exp + '_' + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
+    package_re[exp] = (re.compile('(^|[#\'"\s\-\+]+)' + exp + '_' + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
 
 # Other substitutions to make
 subs = {
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/2 convert-overrides.py: skip patches

If a line specifies a patch, skip it.

---
 scripts/contrib/convert-overrides.py | 1 +
 1 file changed, 1 insertion(+)
scripts/contrib/convert-overrides.py +1 -0
index 4d41a4c475..387e29d66d 100755
@@ -63,6 +63,7 @@ skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky
 skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"]
 skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"]
 skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"]
+skips = skips + ["file://"]
 
 imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"]
 packagevars = packagevars + imagevars
Signature · 1 line
2.30.2
#2 lore raw

Re: [OE-core][PATCH 2/2] convert-overrides.py: skip patches

Quoted 12 lines · Chen Qi

If a line specifies a patch, skip it.

---
 scripts/contrib/convert-overrides.py | 1 +

 1 file changed, 1 insertion(+)
scripts/contrib/convert-overrides.py +0 -0
index 4d41a4c475..387e29d66d 100755
@@ -63,6 +63,7 @@ skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky
Quoted 4 lines

 skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"] skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] +skips = skips + ["file://"]

This is never simple since this would now skip:

SRC_URI_append = " file://xxxx"

I'm not sure which issue is better/worse...

Cheers,

Richard

author
#3 lore raw

Re: [OE-core][PATCH 2/2] convert-overrides.py: skip patches

Quoted 19 lines · Richard Purdie
Quoted 12 lines · Chen Qi

If a line specifies a patch, skip it.

---
  scripts/contrib/convert-overrides.py | 1 +
  1 file changed, 1 insertion(+)
scripts/contrib/convert-overrides.py +0 -0
index 4d41a4c475..387e29d66d 100755

scripts/contrib/convert-overrides.py skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky · line 66

Quoted 4 lines
scripts/contrib/convert-overrides.py +1 -0
@@ -63,6 +63,7 @@ skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky
  skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"]
  skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"]
  skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"]
+skips = skips + ["file://"]

This is never simple since this would now skip:

Quoted 1 line

SRC_URI_append = " file://xxxx"

I didn't realize such case. Thanks for pointing it out.

Regards,
Qi

Quoted 9 lines

I'm not sure which issue is better/worse...

Cheers,

Richard

#4 lore raw
In reply to Chen Qi

Can you please bump the script version as well?

Quoted 54 lines · Chen Qi

Currently lines like below are converted.
e.g.
# IMAGE_INSTALL_append = " A"

But lines without a leading whitespace are not converted.
e.g.
#IMAGE_INSTALL_append = " A"

We should be converting both.

---
 scripts/contrib/convert-overrides.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/contrib/convert-overrides.py +3 -2
index e4a310d1d6..4d41a4c475 100755
@@ -69,15 +69,15 @@ packagevars = packagevars + imagevars
 
 vars_re = {}
 for exp in vars:
-    vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_'
+ exp), r"\1:" + exp)
+    vars_re[exp] = (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_'
+ exp), r"\1:" + exp)
 
 shortvars_re = {}
 for exp in shortvars:
-    shortvars_re[exp] =

(re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")
+ shortvars_re[exp] =
(re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")

package_re = {}
for exp in packagevars:
- package_re[exp] = (re.compile('(^|[\'"\s\-\+]+)' + exp + '_' +
'([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
+ package_re[exp] = (re.compile('(^|[#\'"\s\-\+]+)' + exp + '_' +
'([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")

# Other substitutions to make
subs = {
--
2.30.2

author
#5 lore raw

Got it. I've sent out V2.

Regards,
Qi

Quoted 66 lines · Martin Jansa

Can you please bump the script version as well?

On Fri, Aug 6, 2021 at 11:03 AM Chen Qi <[email protected] <mailto:[email protected]>> wrote:

    Currently lines like below are converted.
      e.g.
      # IMAGE_INSTALL_append = " A"

    But lines without a leading whitespace are not converted.
      e.g.
      #IMAGE_INSTALL_append = " A"

    We should be converting both.

    Signed-off-by: Chen Qi <[email protected]
    <mailto:[email protected]>>
    ---
     scripts/contrib/convert-overrides.py
    <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
    | 6 +++---
     1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/scripts/contrib/convert-overrides.py
    <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
    b/scripts/contrib/convert-overrides.py
    <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
    index e4a310d1d6..4d41a4c475 100755
    --- a/scripts/contrib/convert-overrides.py
    <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
    +++ b/scripts/contrib/convert-overrides.py
    <https://urldefense.com/v3/__http://convert-overrides.py__;%21%21AjveYdw8EvQ%21PD0spdg2c_3A47Id6ecejSLJcClzE1tewbyquzswai_YYcg_XxOQyX2l9AH3cc9f2A$>
    @@ -69,15 +69,15 @@ packagevars = packagevars + imagevars

     vars_re = {}
     for exp in vars:
    -    vars_re[exp] =
    (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp),
    r"\1:" + exp)
    +    vars_re[exp] =
    (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp),
    r"\1:" + exp)

     shortvars_re = {}
     for exp in shortvars:
    -    shortvars_re[exp] =
    (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp +
    '([\(\'"\s:])'), r"\1:" + exp + r"\3")
    +    shortvars_re[exp] =
    (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp +
    '([\(\'"\s:])'), r"\1:" + exp + r"\3")

     package_re = {}
     for exp in packagevars:
    -    package_re[exp] = (re.compile('(^|[\'"\s\-\+]+)' + exp + '_'
    + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
    +    package_re[exp] = (re.compile('(^|[#\'"\s\-\+]+)' + exp + '_'
    + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")

     # Other substitutions to make
     subs = {
    -- 
    2.30.2