sysroot.patch 3.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
  2. index 86da04d..0b5f38c 100644
  3. --- a/build/checksums/vscode-sysroot.txt
  4. +++ b/build/checksums/vscode-sysroot.txt
  5. @@ -1,3 +1,6 @@
  6. -a2d51dc505ed544c52757f90bcdab44920132295fc7a67166eff86b6e0e24aa8 aarch64-linux-gnu.tar.gz
  7. -032cf16bf8b965e1351305f10f3dedabf4f9868027ac6d0e8f52321ca0b70d4a arm-rpi-linux-gnueabihf.tar.gz
  8. -360475a764d0faf4d3743aa866347eff78072639d20660def83e1a03eadf534c x86_64-linux-gnu.tar.gz
  9. +68a17006021975ff271a1dd615f9db9eda7c25f2cc65e750c87980dc57a06c94 aarch64-linux-gnu-glibc-2.17.tar.gz
  10. +0de422a81683cf9e8cf875dbd1e0c27545ac3c775b2d53015daf3ca2b31d3f15 aarch64-linux-gnu-glibc-2.28.tar.gz
  11. +3ced48cb479f2cdba95aa649710fcb7778685551c745bbd76ac706c3c0ead9fb arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz
  12. +7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
  13. +5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658 x86_64-linux-gnu-glibc-2.17.tar.gz
  14. +dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784 x86_64-linux-gnu-glibc-2.28.tar.gz
  15. diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
  16. index 40ca42e..d637fce 100644
  17. --- a/build/linux/debian/install-sysroot.js
  18. +++ b/build/linux/debian/install-sysroot.js
  19. @@ -69,3 +69,3 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
  20. const timeout = setTimeout(() => controller.abort(), 30 * 1000);
  21. - const version = '20231122-245579';
  22. + const version = '20240129-253798';
  23. try {
  24. @@ -121,5 +121,6 @@ async function getVSCodeSysroot(arch) {
  25. let triple;
  26. + const prefix = process.env['VSCODE_SYSROOT_PREFIX'] ?? '-glibc-2.28';
  27. switch (arch) {
  28. case 'amd64':
  29. - expectedName = `x86_64-linux-gnu.tar.gz`;
  30. + expectedName = `x86_64-linux-gnu${prefix}.tar.gz`;
  31. triple = 'x86_64-linux-gnu';
  32. @@ -127,3 +128,3 @@ async function getVSCodeSysroot(arch) {
  33. case 'arm64':
  34. - expectedName = `aarch64-linux-gnu.tar.gz`;
  35. + expectedName = `aarch64-linux-gnu${prefix}.tar.gz`;
  36. triple = 'aarch64-linux-gnu';
  37. @@ -131,3 +132,3 @@ async function getVSCodeSysroot(arch) {
  38. case 'armhf':
  39. - expectedName = `arm-rpi-linux-gnueabihf.tar.gz`;
  40. + expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
  41. triple = 'arm-rpi-linux-gnueabihf';
  42. @@ -135,2 +136,3 @@ async function getVSCodeSysroot(arch) {
  43. }
  44. + console.log(`Fetching ${expectedName} for ${triple}`);
  45. const checksumSha256 = getVSCodeSysrootChecksum(expectedName);
  46. diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
  47. index e824f19..b9a6e80 100644
  48. --- a/build/linux/rpm/dep-lists.js
  49. +++ b/build/linux/rpm/dep-lists.js
  50. @@ -44,6 +44,3 @@ exports.referenceGeneratedDepsByArch = {
  51. 'libc.so.6(GLIBC_2.17)(64bit)',
  52. - 'libc.so.6(GLIBC_2.18)(64bit)',
  53. 'libc.so.6(GLIBC_2.2.5)(64bit)',
  54. - 'libc.so.6(GLIBC_2.25)(64bit)',
  55. - 'libc.so.6(GLIBC_2.27)(64bit)',
  56. 'libc.so.6(GLIBC_2.28)(64bit)',
  57. @@ -143,5 +140,2 @@ exports.referenceGeneratedDepsByArch = {
  58. 'libc.so.6(GLIBC_2.17)',
  59. - 'libc.so.6(GLIBC_2.18)',
  60. - 'libc.so.6(GLIBC_2.25)',
  61. - 'libc.so.6(GLIBC_2.27)',
  62. 'libc.so.6(GLIBC_2.28)',
  63. @@ -247,5 +241,2 @@ exports.referenceGeneratedDepsByArch = {
  64. 'libc.so.6(GLIBC_2.17)(64bit)',
  65. - 'libc.so.6(GLIBC_2.18)(64bit)',
  66. - 'libc.so.6(GLIBC_2.25)(64bit)',
  67. - 'libc.so.6(GLIBC_2.27)(64bit)',
  68. 'libc.so.6(GLIBC_2.28)(64bit)',