patching: enhance the DT Makefile Autopatcher to work with armhf's new 6.5 subdir Makefiles as well as arm64

- arm64: one-rule-per-dtb
- arm32: single-rule, multi-dtb

lib/tools/common/dt_makefile_patcher.py

@@ -35,7 +35,7 @@ class AutoPatcherParams:
 		self.git_repo = git_repo
 
 
-def auto_patch_dt_makefile(git_work_dir: str, dt_rel_dir: str) -> dict[str, str]:
+def auto_patch_dt_makefile(git_work_dir: str, dt_rel_dir: str, config_var: str) -> dict[str, str]:
 	ret: dict[str, str] = {}
 	dt_path = os.path.join(git_work_dir, dt_rel_dir)
 	# Bomb if it does not exist or is not a directory
@@ -56,24 +56,39 @@ def auto_patch_dt_makefile(git_work_dir: str, dt_rel_dir: str) -> dict[str, str]
 	# Parse it into a list of lines
 	makefile_lines = makefile_contents.splitlines()
 	log.info(f"Read {len(makefile_lines)} lines from {makefile_path}")
-	regex = r"^dtb-\$\(([a-zA-Z_]+)\)\s+\+=\s+([a-zA-Z0-9-_]+)\.dtb"
+	regex_dtb = r"(.*)\s(([a-zA-Z0-9-_]+)\.dtb)(.*)"
-	# For each line, check if it matches the regex, extract the groups
+	regex_configopt = r"^dtb-\$\(([a-zA-Z_]+)\)\s+"
+
+	# For each line, check if it matches the regex_dtb, extract the groups
 	line_counter = 0
 	line_first_match = 0
 	line_last_match = 0
-	config_var_dict: set[str] = set()
+	list_dts_basenames: list[str] = []
+	list_configvars: list[str] = []
 	for line in makefile_lines:
 		line_counter += 1
-		match = re.match(regex, line)
+		match_dtb = re.match(regex_dtb, line)
-		if match:
+		match_configopt = re.match(regex_configopt, line)
+		if match_dtb or match_configopt:
 			line_first_match = line_counter if line_first_match == 0 else line_first_match
 			line_last_match = line_counter
-			config_var_dict.add(match.group(1))
+			if match_dtb:
-	# Sanity check, make sure config_var_dict is not empty and has only one element
+				list_dts_basenames.append(match_dtb.group(3))
-	if len(config_var_dict) != 1:
+			if match_configopt:
-		raise ValueError(f"config_var_dict={config_var_dict} -- found too few or too many CONFIG_ARCH_xx variables in {makefile_path}")
+				list_configvars.append(match_configopt.group(1))
-	config_var = config_var_dict.pop()
+
-	log.info(f"Found '{config_var}' in Makefile lines {line_first_match} to {line_last_match}")
+	dict_dts_basenames = set(list_dts_basenames)  # reduce list to set
+	# Sanity checks
+	# SC: make sure dict_dts_basenames has at least one element
+	if len(dict_dts_basenames) < 1:
+		raise ValueError(
+			f"dict_dts_basenames={dict_dts_basenames} -- found {len(dict_dts_basenames)} dtbs, expected more than zero in {makefile_path}")
+
+	dict_configvars = set(list_configvars)  # reduce list to set
+	# SC: make sure dict_configvars has exactly one element
+	if len(dict_configvars) != 1:
+		raise ValueError(f"dict_configvars={dict_configvars} -- found {len(dict_configvars)} configvars, expected exactly one in {makefile_path}")
+
 	# Now compute the preambles and the postamble
 	preamble_lines = makefile_lines[:line_first_match - 1]
 	postamble_lines = makefile_lines[line_last_match:]
@@ -91,8 +106,19 @@ def auto_patch_dt_makefile(git_work_dir: str, dt_rel_dir: str) -> dict[str, str]
 		log.debug(f"Found {dts_file}")
 	# Create the mid-amble, which is the list of .dtb files to be built
 	midamble_lines = []
-	for dts_file in dts_files:
+
-		midamble_lines.append(f"dtb-$({config_var}) += {dts_file}.dtb")
+	# If we've found an equal number of dtbs and configvars, means one-rule-per-dtb (arm64) style
+	if len(list_dts_basenames) == len(list_configvars):
+		for dts_file in dts_files:
+			midamble_lines.append(f"dtb-$({config_var}) += {dts_file}.dtb")
+	# Otherwise one-rule-for-all-dtbs (arm 32-bit) style, where the last one hasn't a trailing backslash
+	# Important, this requires 6.5-rc1's move to subdir-per-vendor and can't handle the all-in-one Makefile before it
+	else:
+		midamble_lines.append(f"dtb-$({config_var}) += \\")
+		dtb_single_rule_list = []
+		for dts_file in dts_files:
+			dtb_single_rule_list.append(f"\t{dts_file}.dtb")
+		midamble_lines.append(" \\\n".join(dtb_single_rule_list))
 
 	# Late to the game: if DT_DIR/overlay/Makefile exists, add it.
 	overlay_lines = []
@@ -178,8 +204,9 @@ def copy_bare_files(autopatcher_params: AutoPatcherParams, type: str):
 
 def auto_patch_all_dt_makefiles(autopatcher_params: AutoPatcherParams):
 	for one_autopatch_config in autopatcher_params.pconfig.autopatch_makefile_dt_configs:
-		log.warning(f"Autopatching DT Makefile in {one_autopatch_config.directory}...")
+		log.warning(f"Autopatching DT Makefile in {one_autopatch_config.directory} with config '{one_autopatch_config.config_var}'...")
-		autopatch_makefile_info = auto_patch_dt_makefile(autopatcher_params.git_work_dir, one_autopatch_config.directory)
+		autopatch_makefile_info = auto_patch_dt_makefile(
+			autopatcher_params.git_work_dir, one_autopatch_config.directory, one_autopatch_config.config_var)
 		if autopatcher_params.apply_patches_to_git:
 			autopatcher_params.git_repo.git.add(autopatch_makefile_info["MAKEFILE_PATH"])
 			maintainer_actor: Actor = Actor("Armbian DT Makefile AutoPatcher", "patching@armbian.com")