From eb9ca73e128eeda1561f630cba5c84606111c669 Mon Sep 17 00:00:00 2001 From: pykpkg47 <118465017+pykpkg47@users.noreply.github.com> Date: Wed, 11 Dec 2024 23:25:03 +0000 Subject: [PATCH] patch: remove broken symlink to fix github action start on newer armbian build versions --- .../0000.patching_config.yaml | 36 ------------------- .../dt/rk3588-nanopc-cm3588-nas.dts | 1 - 2 files changed, 37 deletions(-) delete mode 100644 patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml delete mode 120000 patch/kernel/rockchip-rk3588-collabora/dt/rk3588-nanopc-cm3588-nas.dts diff --git a/patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml b/patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml deleted file mode 100644 index 8a07d6646f..0000000000 --- a/patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml +++ /dev/null @@ -1,36 +0,0 @@ -config: # This is file 'patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml' - - # Just some info stuff; not used by the patching scripts - name: rockchip-rk3588-collabora - kind: kernel - type: mainline # or: vendor - branch: linux-6.9.y - last-known-good-tag: v6.9-rc1 - maintainers: - - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini } - - # .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" } - - # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones - # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in. - # @TODO need a solution to auto-Makefile the overlays as well - overlay-directories: - - { source: "overlay", target: "arch/arm64/boot/dts/rockchip/overlay" } - - # 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! - auto-patch-dt-makefile: - - { 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 - diff --git a/patch/kernel/rockchip-rk3588-collabora/dt/rk3588-nanopc-cm3588-nas.dts b/patch/kernel/rockchip-rk3588-collabora/dt/rk3588-nanopc-cm3588-nas.dts deleted file mode 120000 index 710132e5af..0000000000 --- a/patch/kernel/rockchip-rk3588-collabora/dt/rk3588-nanopc-cm3588-nas.dts +++ /dev/null @@ -1 +0,0 @@ -../../rockchip-rk3588-edge/dt/rk3588-nanopc-cm3588-nas.dts \ No newline at end of file