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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. From 6c534728fde6a9582915995a2742808764fe4783 Mon Sep 17 00:00:00 2001
  2. From: Paul Kocialkowski <contact@paulk.fr>
  3. Date: Wed, 20 Jul 2016 16:03:30 +0200
  4. Subject: [PATCH 1/2] 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. Change-Id: I54de09656bd2dd9c308bd6c8dce554945aa8e535
  8. Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  9. ---
  10. .gitmodules | 20 --------------------
  11. 3rdparty/arm-trusted-firmware | 1 -
  12. 3rdparty/blobs | 1 -
  13. 3rdparty/chromeec | 1 -
  14. 3rdparty/libgfxinit | 1 -
  15. 3rdparty/libhwbase | 1 -
  16. 3rdparty/vboot | 1 -
  17. Makefile.inc | 11 -----------
  18. 8 files changed, 37 deletions(-)
  19. delete mode 160000 3rdparty/arm-trusted-firmware
  20. delete mode 160000 3rdparty/blobs
  21. delete mode 160000 3rdparty/chromeec
  22. delete mode 160000 3rdparty/libgfxinit
  23. delete mode 160000 3rdparty/libhwbase
  24. delete mode 160000 3rdparty/vboot
  25. diff --git a/.gitmodules b/.gitmodules
  26. index c3270e6ae2..3a617c7dc5 100644
  27. --- a/.gitmodules
  28. +++ b/.gitmodules
  29. @@ -1,23 +1,3 @@
  30. -[submodule "3rdparty/blobs"]
  31. - path = 3rdparty/blobs
  32. - url = ../blobs.git
  33. - update = none
  34. - ignore = dirty
  35. [submodule "util/nvidia-cbootimage"]
  36. path = util/nvidia/cbootimage
  37. url = ../nvidia-cbootimage.git
  38. -[submodule "vboot"]
  39. - path = 3rdparty/vboot
  40. - url = ../vboot.git
  41. -[submodule "arm-trusted-firmware"]
  42. - path = 3rdparty/arm-trusted-firmware
  43. - url = ../arm-trusted-firmware.git
  44. -[submodule "3rdparty/chromeec"]
  45. - path = 3rdparty/chromeec
  46. - url = ../chrome-ec.git
  47. -[submodule "libhwbase"]
  48. - path = 3rdparty/libhwbase
  49. - url = ../libhwbase.git
  50. -[submodule "libgfxinit"]
  51. - path = 3rdparty/libgfxinit
  52. - url = ../libgfxinit.git
  53. diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
  54. deleted file mode 160000
  55. index 236c27d21f..0000000000
  56. --- a/3rdparty/arm-trusted-firmware
  57. +++ /dev/null
  58. @@ -1 +0,0 @@
  59. -Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d
  60. diff --git a/3rdparty/blobs b/3rdparty/blobs
  61. deleted file mode 160000
  62. index 8090bdd598..0000000000
  63. --- a/3rdparty/blobs
  64. +++ /dev/null
  65. @@ -1 +0,0 @@
  66. -Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b
  67. diff --git a/3rdparty/chromeec b/3rdparty/chromeec
  68. deleted file mode 160000
  69. index bcffec7fdc..0000000000
  70. --- a/3rdparty/chromeec
  71. +++ /dev/null
  72. @@ -1 +0,0 @@
  73. -Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75
  74. diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
  75. deleted file mode 160000
  76. index 88a7f17b7d..0000000000
  77. --- a/3rdparty/libgfxinit
  78. +++ /dev/null
  79. @@ -1 +0,0 @@
  80. -Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d
  81. diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase
  82. deleted file mode 160000
  83. index aab715f166..0000000000
  84. --- a/3rdparty/libhwbase
  85. +++ /dev/null
  86. @@ -1 +0,0 @@
  87. -Subproject commit aab715f166bf1b54cfbd6982e8df49248ea544d8
  88. diff --git a/3rdparty/vboot b/3rdparty/vboot
  89. deleted file mode 160000
  90. index adfafba793..0000000000
  91. --- a/3rdparty/vboot
  92. +++ /dev/null
  93. @@ -1 +0,0 @@
  94. -Subproject commit adfafba793684ed92965dfbd86b3fb3463975d8c
  95. diff --git a/Makefile.inc b/Makefile.inc
  96. index c5ce30f2b1..919a5d4ac1 100644
  97. --- a/Makefile.inc
  98. +++ b/Makefile.inc
  99. @@ -183,17 +183,6 @@ ifeq ($(CONFIG_COVERAGE),y)
  100. ramstage-c-ccopts += -fprofile-arcs -ftest-coverage
  101. endif
  102. -ifneq ($(UPDATED_SUBMODULES),1)
  103. -# try to fetch non-optional submodules if the source is under git
  104. -forgetthis:=$(if $(GIT),$(shell git submodule update --init))
  105. -ifeq ($(CONFIG_USE_BLOBS),y)
  106. -# this is necessary because 3rdparty/blobs is update=none, and so is ignored
  107. -# unless explicitly requested and enabled through --checkout
  108. -forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs))
  109. -endif
  110. -export UPDATED_SUBMODULES:=1
  111. -endif
  112. -
  113. ramstage-c-deps:=$$(OPTION_TABLE_H)
  114. romstage-c-deps:=$$(OPTION_TABLE_H)
  115. libverstage-c-deps:=$$(OPTION_TABLE_H)
  116. --
  117. 2.11.0