fix.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. --- a/package/boot/arm-trusted-firmware-rockchip/Makefile
  2. +++ b/package/boot/arm-trusted-firmware-rockchip/Makefile
  3. @@ -28,7 +28,7 @@ define Package/arm-trusted-firmware-rockchip
  4. SECTION:=boot
  5. CATEGORY:=Boot Loaders
  6. TITLE:=ARM Trusted Firmware for Rockchip
  7. - DEPENDS:=@TARGET_rockchip_armv8
  8. + DEPENDS:=@TARGET_rockchip_rk3588_armv8
  9. endef
  10. define Build/Prepare
  11. --- a/package/boot/uboot-rockchip/Makefile
  12. +++ b/package/boot/uboot-rockchip/Makefile
  13. @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/u-boot.mk
  14. include $(INCLUDE_DIR)/package.mk
  15. define U-Boot/Default
  16. - BUILD_TARGET:=rockchip
  17. + BUILD_TARGET:=rockchip_rk3588
  18. UENV:=default
  19. HIDDEN:=1
  20. endef
  21. new file mode 100644
  22. index 000000000..ddfa7f575
  23. --- /dev/null
  24. +++ b/target/linux/rockchip_rk3588/patches-5.10/199-fix_pthread_once_error.patch
  25. @@ -0,0 +1,11 @@
  26. +--- a/scripts/Makefile
  27. ++++ b/scripts/Makefile
  28. +@@ -22,7 +22,7 @@
  29. + HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
  30. + HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
  31. + HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
  32. +-HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
  33. ++HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) -lpthread
  34. +
  35. + ifdef CONFIG_UNWINDER_ORC
  36. + ifeq ($(ARCH),x86_64)
  37. --- a/package/kernel/linux/modules/netfilter.mk
  38. +++ b/package/kernel/linux/modules/netfilter.mk
  39. @@ -39,6 +39,17 @@ endef
  40. $(eval $(call KernelPackage,nf-reject6))
  41. +define KernelPackage/nf-conncount
  42. + SUBMENU:=$(NF_MENU)
  43. + TITLE:=Netfilter conncount support
  44. + KCONFIG:=$(KCONFIG_NF_CONNCOUNT)
  45. + HIDDEN:=1
  46. + DEPENDS:=+kmod-nf-conntrack
  47. + FILES:=$(foreach mod,$(NF_CONNCOUNT-m),$(LINUX_DIR)/net/$(mod).ko)
  48. + AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNCOUNT-m)))
  49. +endef
  50. +
  51. +$(eval $(call KernelPackage,nf-conncount))
  52. define KernelPackage/nf-ipt
  53. SUBMENU:=$(NF_MENU)
  54. @@ -236,6 +247,7 @@ $(eval $(call KernelPackage,ipt-conntrack))
  55. define KernelPackage/ipt-conntrack-extra
  56. TITLE:=Extra connection tracking modules
  57. + DEPENDS:=+kmod-nf-conncount
  58. KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
  59. FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
  60. AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK_EXTRA-m)))