Merge branch 'bugfix/kconfig_checker_osource' into 'master'

kconfig: update check_kconfigs.py to handle orsource command

See merge request espressif/esp-idf!18013

components/esp_hw_support/Kconfig

@@ -13,7 +13,7 @@ menu "Hardware Settings"
             bool
 
             # Insert chip-specific MAC config
-            rsource "./port/$IDF_TARGET/Kconfig.mac"
+        rsource "./port/$IDF_TARGET/Kconfig.mac"
     endmenu
 
     menu "Sleep Config"
@@ -74,8 +74,8 @@ menu "Hardware Settings"
     menu "RTC Clock Config"
         orsource "./port/$IDF_TARGET/Kconfig.rtc"
 
-        # This is used for configure the RTC clock.
         config RTC_CLOCK_BBPLL_POWER_ON_WITH_USB
+            # This is used for configure the RTC clock.
             bool "Keep BBPLL clock always work"
             depends on ESP_CONSOLE_USB_SERIAL_JTAG || ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
             default y

tools/ci/check_kconfigs.py

@@ -75,7 +75,8 @@ class SourceChecker(BaseChecker):
     # allow to source only files which will be also checked by the script
     # Note: The rules are complex and the LineRuleChecker cannot be used
     def process_line(self, line, line_number):
-        m = re.search(r'^\s*source(\s*)"([^"]+)"', line)
+        m = re.search(r'^\s*[ro]{0,2}source(\s*)"([^"]+)"', line)
+
         if m:
             if len(m.group(1)) == 0:
                 raise InputError(self.path_in_idf, line_number, '"source" has to been followed by space',
@@ -140,6 +141,9 @@ class IndentAndNameChecker(BaseChecker):
                                               |(help)
                                               |(if)
                                               |(source)
+                                              |(osource)
+                                              |(rsource)
+                                              |(orsource)
                                           )
                                        ''', re.X)
 
@@ -199,7 +203,7 @@ class IndentAndNameChecker(BaseChecker):
             print('level+', new_item, ': ', self.level_stack, end=' -> ')
         # "config" and "menuconfig" don't have a closing pair. So if new_item is an item which need to be indented
         # outside the last "config" or "menuconfig" then we need to find to a parent where it belongs
-        if new_item in ['config', 'menuconfig', 'menu', 'choice', 'if', 'source']:
+        if new_item in ['config', 'menuconfig', 'menu', 'choice', 'if', 'source', 'rsource', 'osource', 'orsource']:
             # item is not belonging to a previous "config" or "menuconfig" so need to indent to parent
             for i, item in enumerate(reversed(self.level_stack)):
                 if item in ['menu', 'mainmenu', 'choice', 'if']:

tools/test_apps/build_system/rsource_test/main/Kconfig

@@ -1 +1 @@
-rsource "port/$IDF_TARGET/Kconfig"
+rsource "port/$IDF_TARGET/Kconfig.port"