fix.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  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_armv8_bsp
  9. endef
  10. define Build/Prepare
  11. new file mode 100644
  12. index 000000000..ddfa7f575
  13. --- /dev/null
  14. +++ b/target/linux/rockchip/patches-5.10/199-fix_pthread_once_error.patch
  15. @@ -0,0 +1,11 @@
  16. +--- a/scripts/Makefile
  17. ++++ b/scripts/Makefile
  18. +@@ -22,7 +22,7 @@
  19. + HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
  20. + HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
  21. + HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
  22. +-HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
  23. ++HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) -lpthread
  24. +
  25. + ifdef CONFIG_UNWINDER_ORC
  26. + ifeq ($(ARCH),x86_64)
  27. --- a/package/kernel/linux/modules/netfilter.mk
  28. +++ b/package/kernel/linux/modules/netfilter.mk
  29. @@ -39,6 +39,17 @@ endef
  30. $(eval $(call KernelPackage,nf-reject6))
  31. +define KernelPackage/nf-conncount
  32. + SUBMENU:=$(NF_MENU)
  33. + TITLE:=Netfilter conncount support
  34. + KCONFIG:=$(KCONFIG_NF_CONNCOUNT)
  35. + HIDDEN:=1
  36. + DEPENDS:=+kmod-nf-conntrack
  37. + FILES:=$(foreach mod,$(NF_CONNCOUNT-m),$(LINUX_DIR)/net/$(mod).ko)
  38. + AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNCOUNT-m)))
  39. +endef
  40. +
  41. +$(eval $(call KernelPackage,nf-conncount))
  42. define KernelPackage/nf-ipt
  43. SUBMENU:=$(NF_MENU)
  44. @@ -236,6 +247,7 @@ $(eval $(call KernelPackage,ipt-conntrack))
  45. define KernelPackage/ipt-conntrack-extra
  46. TITLE:=Extra connection tracking modules
  47. + DEPENDS:=+kmod-nf-conncount
  48. KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
  49. FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
  50. AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK_EXTRA-m)))