open-core.diff 5.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  1. diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
  2. index 07ec242e63..2d6ea39d23 100644
  3. --- a/meta/classes/kernel-arch.bbclass
  4. +++ b/meta/classes/kernel-arch.bbclass
  5. @@ -31,6 +31,7 @@ def map_kernel_arch(a, d):
  6. elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a): return 'mips'
  7. elif re.match('mcf', a): return 'm68k'
  8. elif re.match('riscv(32|64|)(eb|)$', a): return 'riscv'
  9. + elif re.match('csky', a): return 'csky'
  10. elif re.match('p(pc|owerpc)(|64)', a): return 'powerpc'
  11. elif re.match('sh(3|4)$', a): return 'sh'
  12. elif re.match('bfin', a): return 'blackfin'
  13. diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
  14. index e6236c0bb2..191026d344 100644
  15. --- a/meta/classes/package.bbclass
  16. +++ b/meta/classes/package.bbclass
  17. @@ -1429,7 +1429,8 @@ python populate_packages () {
  18. mkdir_recurse(dvar, root, os.path.dirname(file))
  19. fpath = os.path.join(root,file)
  20. if not cpath.islink(file):
  21. - os.link(file, fpath)
  22. + if not os.path.exists(fpath):
  23. + os.link(file, fpath)
  24. continue
  25. ret = bb.utils.copyfile(file, fpath)
  26. if ret is False or ret == 0:
  27. diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
  28. index 0bd1f36805..7cd249d94c 100644
  29. --- a/meta/classes/siteinfo.bbclass
  30. +++ b/meta/classes/siteinfo.bbclass
  31. @@ -54,6 +54,7 @@ def siteinfo_data_for_machine(arch, os, d):
  32. "ppc64le" : "endian-little bit-64 powerpc-common",
  33. "riscv32": "endian-little bit-32 riscv-common",
  34. "riscv64": "endian-little bit-64 riscv-common",
  35. + "csky": "endian-little bit-32 csky-common",
  36. "sh3": "endian-little bit-32 sh-common",
  37. "sh3eb": "endian-big bit-32 sh-common",
  38. "sh4": "endian-little bit-32 sh-common",
  39. @@ -118,6 +119,8 @@ def siteinfo_data_for_machine(arch, os, d):
  40. "riscv64-linux": "riscv64-linux",
  41. "riscv64-linux-musl": "riscv64-linux",
  42. "x86_64-cygwin": "bit-64",
  43. + "csky-linux": "csky-linux",
  44. + "csky-linux-musl": "csky-linux",
  45. "x86_64-darwin": "bit-64",
  46. "x86_64-darwin9": "bit-64",
  47. "x86_64-linux": "bit-64",
  48. diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py
  49. index df0a4593fa..a861b6f1fe 100644
  50. --- a/meta/lib/oe/elf.py
  51. +++ b/meta/lib/oe/elf.py
  52. @@ -24,6 +24,7 @@ def machine_dict(d):
  53. "microblaze": (189, 0, 0, False, 32),
  54. "microblazeel":(189, 0, 0, True, 32),
  55. "powerpc": (20, 0, 0, False, 32),
  56. + "csky": (252, 0, 0, True, 32),
  57. "riscv32": (243, 0, 0, True, 32),
  58. "riscv64": (243, 0, 0, True, 64),
  59. },
  60. @@ -53,6 +54,7 @@ def machine_dict(d):
  61. "mipsisa64r6": ( 8, 0, 0, False, 64),
  62. "mipsisa64r6el": ( 8, 0, 0, True, 64),
  63. "nios2": (113, 0, 0, True, 32),
  64. + "csky": (252, 0, 0, True, 32),
  65. "riscv32": (243, 0, 0, True, 32),
  66. "riscv64": (243, 0, 0, True, 64),
  67. "s390": (22, 0, 0, False, 32),
  68. @@ -80,6 +82,7 @@ def machine_dict(d):
  69. "mips64el": ( 8, 0, 0, True, 64),
  70. "microblaze": (189, 0, 0, False, 32),
  71. "microblazeel":(189, 0, 0, True, 32),
  72. + "csky": (252, 0, 0, True, 32),
  73. "riscv32": (243, 0, 0, True, 32),
  74. "riscv64": (243, 0, 0, True, 64),
  75. "sh4": ( 42, 0, 0, True, 32),
  76. diff --git a/meta/recipes-bsp/opensbi/opensbi_0.8.bb b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
  77. index bfe2a71b9a..03830dbadb 100644
  78. --- a/meta/recipes-bsp/opensbi/opensbi_0.8.bb
  79. +++ b/meta/recipes-bsp/opensbi/opensbi_0.8.bb
  80. @@ -41,7 +41,7 @@ FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
  81. # FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
  82. # FILES_${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
  83. -COMPATIBLE_HOST = "(riscv64|riscv32).*"
  84. +COMPATIBLE_HOST = "(riscv64|riscv32|csky).*"
  85. INHIBIT_PACKAGE_STRIP = "1"
  86. SECURITY_CFLAGS = ""
  87. diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb
  88. index eb11fe3960..c47eec3f00 100644
  89. --- a/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb
  90. +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1h.bb
  91. @@ -107,6 +107,9 @@ do_configure () {
  92. linux-riscv32)
  93. target=linux-generic32
  94. ;;
  95. + linux-csky)
  96. + target=linux-generic32
  97. + ;;
  98. linux-riscv64)
  99. target=linux-generic64
  100. ;;