hisilicon-opensdk: re-apply overlay in target-finalize to beat osdrv (#2021)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: widgetii

general/package/hisilicon-opensdk/hisilicon-opensdk.mk

@@ -255,3 +255,15 @@ define HISILICON_OPENSDK_CLEANUP_EXTRA
 endef
 HISILICON_OPENSDK_POST_INSTALL_TARGET_HOOKS += HISILICON_OPENSDK_CLEANUP_EXTRA
 endif
+
+# In per-package mode, target-finalize merges per-package/*/target/ into
+# output/target/ in alphabetical order ($(sort $(PACKAGES))), not dependency
+# order. That makes hisilicon-osdrv-* clobber files we install here, even
+# though HISILICON_OPENSDK_DEPENDENCIES sequences us after osdrv during build.
+# Re-apply our per-package overlay onto the merged target after the rsync.
+ifeq ($(BR2_PACKAGE_HISILICON_OPENSDK)$(BR2_PER_PACKAGE_DIRECTORIES),yy)
+define HISILICON_OPENSDK_FINAL_OVERLAY
+	rsync -a $(PER_PACKAGE_DIR)/hisilicon-opensdk/target/ $(TARGET_DIR)/
+endef
+TARGET_FINALIZE_HOOKS += HISILICON_OPENSDK_FINAL_OVERLAY
+endif