Patch kernel dts makefile failed

For Developers
1

openwrt-23.05

I added a new device for testing.
openwrt/target/linux/sunxi/patches-5.15

I added a new patch, starting with 100, which is the first patch in the sorting
900-m1test-linux-kernel.patch

--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1221,6 +1221,7 @@
sun7i-a20-wexler-tab7200.dtb
sun7i-a20-wits-pro-a20-dkt.dtb
dtb-$(CONFIG_MACH_SUN8I) += \

  •  sun8i-h3-m1test.dtb \
  sun8i-a23-evb.dtb \
  sun8i-a23-gt90h-v4.dtb \
  sun8i-a23-inet86dz.dtb \

The dts file can be patched correctly, but the makefile always prompts that the patch failed during compilation.

Patch failed! Please fix /home/ubuntu/m1test/openwrt/target/linux/sunxi/patches-5.15/900-mr100-linux-kernel.patch!
Makefile:30: recipe for target '/home/ubuntu/m1test/openwrt/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/linux-sunxi_cortexa7/linux-5.15.167/.prepared_3187a0d9ee0b876f7a978d142db9e640' failed
make[4]: *** [/home/ubuntu/m1test/openwrt/build_dir/target-arm_cortex-a7+neon-vfpv4_musl_eabi/linux-sunxi_cortexa7/linux-5.15.167/.prepared_3187a0d9ee0b876f7a978d142db9e640] Error 1

I do not have root privileges. I use the Ubuntu account to make

How to solve this problem?

2

you should test using master, AFAIK no PRs using current stable kernel are accepted.

3

But the kernel version of the master is kernel6.x, I want to use kernel 5.x

4

if it still was 5.15, I wouldn't have posted, since it wouldn't have mattered, right ?

are you building for yourself, or for future (public) openwrt support ?

5

I have to do enough testing locally before submitting the patch to openwrt's github
Is there any difference between master and main?

6

Main iirc is now the preferred bleeding development edge. Master has been relegated due to social sensibilities. For all intents Master/Main were equivalent.

7

Is there a 5.x kernel version that can patch the dts/makefile? If the stable version cannot be patched, are there other third-party options?

8

Note:

  • main branch (old: master): for all development (devices, packages, build system, ...)
  • openwrt-* branch: for stable release (backport only for most cases)

There are some useful documents on the OpenWrt Wiki:

https://openwrt.org/docs/guide-developer/toolchain/use-patches-with-buildsystem#adding_or_editing_kernel_patches

https://openwrt.org/submitting-patches#patch_backports

9

New device support is only (exclusively) merged via main/ master, and main is kernel v6.6-only (since this past weekend).