From c0d5616dca76c625e2f4a737e4972befa007c753 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sat, 20 Jan 2024 23:28:21 +0800 Subject: [PATCH] rk35xx-legacy: 0000.patching_config.yaml with incremental: true for rk 5.10 vendor kernel - allows users to put .dts files bare in `userpatches/kernel/rk35xx-legacy/dt` - important: everyone is still invited to send the DTs to https://github.com/armbian/linux-rockchip directly - where yes, they'll have to patch the Makefile there as normal --- .../rk35xx-legacy/0000.patching_config.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 patch/kernel/rk35xx-legacy/0000.patching_config.yaml diff --git a/patch/kernel/rk35xx-legacy/0000.patching_config.yaml b/patch/kernel/rk35xx-legacy/0000.patching_config.yaml new file mode 100644 index 0000000000..9f4190e608 --- /dev/null +++ b/patch/kernel/rk35xx-legacy/0000.patching_config.yaml @@ -0,0 +1,31 @@ +config: + + # Just some info stuff; not used by the patching scripts + name: rk35xx-5.10 + kind: kernel + type: vendor # or: vendor + branch: rk-5.10-rkr6 + last-known-good-tag: v5.10.160 + + # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones. + # This is meant to provide a way to "add a board DTS" without having to null-patch them in. + dts-directories: + - { source: "dt", target: "arch/arm64/boot/dts/rockchip" } + + # the Makefile in each of these directories will be magically patched to include the dts files copied + # or patched-in; overlay subdir will be included "-y" if it exists. + # No more Makefile patching needed, yay! + # "incremental: true" changes the logic of the Makefile re-writing to only add the + # dts-directories's *.dts files to existing Makefile instead of + # full rewrite from *.dts in the dt dir at the end of patching. + auto-patch-dt-makefile: + - { incremental: true, directory: "arch/arm64/boot/dts/rockchip", config-var: "CONFIG_ARCH_ROCKCHIP" } + + # configuration for when applying patches to git / auto-rewriting patches (development cycle helpers) + patches-to-git: + do-not-commit-files: + - "MAINTAINERS" # constant churn, drop them. sorry. + - "Documentation/devicetree/bindings/arm/rockchip.yaml" # constant churn, conflicts on every bump, drop it. sorry. + do-not-commit-regexes: # Python-style regexes + - "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now +