0001-Avoid-using-git-submodules-for-3rdparty.patch 3.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121
  1. From b403ddd709578d11f1e6d32abfc94701f57cae16 Mon Sep 17 00:00:00 2001
  2. From: Paul Kocialkowski <contact@paulk.fr>
  3. Date: Thu, 25 Jan 2018 17:31:55 -0500
  4. Subject: [PATCH] Avoid using git submodules for 3rdparty
  5. This gets rid of git submodules entirely, to avoid the nuisance caused
  6. by automatically checking them out.
  7. ---
  8. .gitmodules | 20 --------------------
  9. 3rdparty/arm-trusted-firmware | 1 -
  10. 3rdparty/blobs | 1 -
  11. 3rdparty/chromeec | 1 -
  12. 3rdparty/libgfxinit | 1 -
  13. 3rdparty/libhwbase | 1 -
  14. 3rdparty/vboot | 1 -
  15. Makefile.inc | 12 ------------
  16. 8 files changed, 38 deletions(-)
  17. delete mode 160000 3rdparty/arm-trusted-firmware
  18. delete mode 160000 3rdparty/blobs
  19. delete mode 160000 3rdparty/chromeec
  20. delete mode 160000 3rdparty/libgfxinit
  21. delete mode 160000 3rdparty/libhwbase
  22. delete mode 160000 3rdparty/vboot
  23. diff --git a/.gitmodules b/.gitmodules
  24. index c3270e6..3a617c7 100644
  25. --- a/.gitmodules
  26. +++ b/.gitmodules
  27. @@ -1,23 +1,3 @@
  28. -[submodule "3rdparty/blobs"]
  29. - path = 3rdparty/blobs
  30. - url = ../blobs.git
  31. - update = none
  32. - ignore = dirty
  33. [submodule "util/nvidia-cbootimage"]
  34. path = util/nvidia/cbootimage
  35. url = ../nvidia-cbootimage.git
  36. -[submodule "vboot"]
  37. - path = 3rdparty/vboot
  38. - url = ../vboot.git
  39. -[submodule "arm-trusted-firmware"]
  40. - path = 3rdparty/arm-trusted-firmware
  41. - url = ../arm-trusted-firmware.git
  42. -[submodule "3rdparty/chromeec"]
  43. - path = 3rdparty/chromeec
  44. - url = ../chrome-ec.git
  45. -[submodule "libhwbase"]
  46. - path = 3rdparty/libhwbase
  47. - url = ../libhwbase.git
  48. -[submodule "libgfxinit"]
  49. - path = 3rdparty/libgfxinit
  50. - url = ../libgfxinit.git
  51. diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
  52. deleted file mode 160000
  53. index b118723..0000000
  54. --- a/3rdparty/arm-trusted-firmware
  55. +++ /dev/null
  56. @@ -1 +0,0 @@
  57. -Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d
  58. diff --git a/3rdparty/blobs b/3rdparty/blobs
  59. deleted file mode 160000
  60. index 8eb92ba..0000000
  61. --- a/3rdparty/blobs
  62. +++ /dev/null
  63. @@ -1 +0,0 @@
  64. -Subproject commit 8eb92ba947e171df11b3c62f5f257ce69b9e2d55
  65. diff --git a/3rdparty/chromeec b/3rdparty/chromeec
  66. deleted file mode 160000
  67. index 9fb1038..0000000
  68. --- a/3rdparty/chromeec
  69. +++ /dev/null
  70. @@ -1 +0,0 @@
  71. -Subproject commit 9fb10386a720d270e37ce61da3ff3a6d5a69951e
  72. diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
  73. deleted file mode 160000
  74. index 42fb2d0..0000000
  75. --- a/3rdparty/libgfxinit
  76. +++ /dev/null
  77. @@ -1 +0,0 @@
  78. -Subproject commit 42fb2d065d604eb08c723ac6b96aeebb4c84cbd3
  79. diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase
  80. deleted file mode 160000
  81. index 6685971..0000000
  82. --- a/3rdparty/libhwbase
  83. +++ /dev/null
  84. @@ -1 +0,0 @@
  85. -Subproject commit 66859712e4817288591908d737dbf41ddea31c3a
  86. diff --git a/3rdparty/vboot b/3rdparty/vboot
  87. deleted file mode 160000
  88. index f6780a3..0000000
  89. --- a/3rdparty/vboot
  90. +++ /dev/null
  91. @@ -1 +0,0 @@
  92. -Subproject commit f6780a36ff19b36abcdb5ace903c4ae2272fb574
  93. diff --git a/Makefile.inc b/Makefile.inc
  94. index 413f7ad..ed2d839 100644
  95. --- a/Makefile.inc
  96. +++ b/Makefile.inc
  97. @@ -191,18 +191,6 @@ ifeq ($(CONFIG_COVERAGE),y)
  98. ramstage-c-ccopts += -fprofile-arcs -ftest-coverage
  99. endif
  100. -ifneq ($(UPDATED_SUBMODULES),1)
  101. -# try to fetch non-optional submodules if the source is under git
  102. -forgetthis:=$(if $(GIT),$(shell git submodule update --init))
  103. -ifeq ($(CONFIG_USE_BLOBS),y)
  104. -# this is necessary because 3rdparty/blobs is update=none, and so is ignored
  105. -# unless explicitly requested and enabled through --checkout
  106. -forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs))
  107. -endif
  108. -UPDATED_SUBMODULES:=1
  109. -COREBOOT_EXPORTS += UPDATED_SUBMODULES
  110. -endif
  111. -
  112. postcar-c-deps:=$$(OPTION_TABLE_H)
  113. ramstage-c-deps:=$$(OPTION_TABLE_H)
  114. romstage-c-deps:=$$(OPTION_TABLE_H)
  115. --
  116. 1.9.1