diff options
| author | Andrew Robbins <contact@andrewrobbins.info> | 2017-12-21 18:19:13 -0500 |
|---|---|---|
| committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-12-22 00:47:16 -0500 |
| commit | fb06ba3c110ccd01d87110595e73b47e7de9cffd (patch) | |
| tree | 527d4f9798bb65a9779044e9248a1452d2aa6bd2 /projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch | |
| parent | f48ed45ae98e8bafcb7bed055bbb01fd6088f082 (diff) | |
| download | librebootfr-fb06ba3c110ccd01d87110595e73b47e7de9cffd.tar.gz librebootfr-fb06ba3c110ccd01d87110595e73b47e7de9cffd.zip | |
Update Coreboot patch for removing git submodules
This is an update to Paul Kocialkowski's previous patch. Only an
absolute minimum of changes were made over those of Paul's in order
for it to apply, successfully, hence keeping Paul as the author of the
patch.
Diffstat (limited to 'projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch')
| -rw-r--r-- | projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch index da906849..6fd53217 100644 --- a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch +++ b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch @@ -1,13 +1,10 @@ -From 6c534728fde6a9582915995a2742808764fe4783 Mon Sep 17 00:00:00 2001 +From c47f1f9e3b5d1a77b5261ad7cb7538c384828487 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski <contact@paulk.fr> -Date: Wed, 20 Jul 2016 16:03:30 +0200 -Subject: [PATCH 1/2] Avoid using git submodules for 3rdparty +Date: Thu, 21 Dec 2017 18:05:33 -0500 +Subject: [PATCH] Avoid using git submodules for 3rdparty This gets rid of git submodules entirely, to avoid the nuisance caused by automatically checking them out. - -Change-Id: I54de09656bd2dd9c308bd6c8dce554945aa8e535 -Signed-off-by: Paul Kocialkowski <contact@paulk.fr> --- .gitmodules | 20 -------------------- 3rdparty/arm-trusted-firmware | 1 - @@ -16,8 +13,8 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> 3rdparty/libgfxinit | 1 - 3rdparty/libhwbase | 1 - 3rdparty/vboot | 1 - - Makefile.inc | 11 ----------- - 8 files changed, 37 deletions(-) + Makefile.inc | 12 ------------ + 8 files changed, 38 deletions(-) delete mode 160000 3rdparty/arm-trusted-firmware delete mode 160000 3rdparty/blobs delete mode 160000 3rdparty/chromeec @@ -26,7 +23,7 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> delete mode 160000 3rdparty/vboot diff --git a/.gitmodules b/.gitmodules -index c3270e6ae2..3a617c7dc5 100644 +index c3270e6..3a617c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,3 @@ @@ -55,51 +52,51 @@ index c3270e6ae2..3a617c7dc5 100644 - url = ../libgfxinit.git diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware deleted file mode 160000 -index 236c27d21f..0000000000 +index b118723..0000000 --- a/3rdparty/arm-trusted-firmware +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d +-Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d diff --git a/3rdparty/blobs b/3rdparty/blobs deleted file mode 160000 -index 8090bdd598..0000000000 +index d2e558a..0000000 --- a/3rdparty/blobs +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b +-Subproject commit d2e558a81f95f7b9149bea6b8362bb43ade82584 diff --git a/3rdparty/chromeec b/3rdparty/chromeec deleted file mode 160000 -index bcffec7fdc..0000000000 +index 9fb1038..0000000 --- a/3rdparty/chromeec +++ /dev/null @@ -1 +0,0 @@ --Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75 +-Subproject commit 9fb10386a720d270e37ce61da3ff3a6d5a69951e diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit deleted file mode 160000 -index 88a7f17b7d..0000000000 +index 42fb2d0..0000000 --- a/3rdparty/libgfxinit +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d +-Subproject commit 42fb2d065d604eb08c723ac6b96aeebb4c84cbd3 diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase deleted file mode 160000 -index aab715f166..0000000000 +index 6685971..0000000 --- a/3rdparty/libhwbase +++ /dev/null @@ -1 +0,0 @@ --Subproject commit aab715f166bf1b54cfbd6982e8df49248ea544d8 +-Subproject commit 66859712e4817288591908d737dbf41ddea31c3a diff --git a/3rdparty/vboot b/3rdparty/vboot deleted file mode 160000 -index adfafba793..0000000000 +index f6780a3..0000000 --- a/3rdparty/vboot +++ /dev/null @@ -1 +0,0 @@ --Subproject commit adfafba793684ed92965dfbd86b3fb3463975d8c +-Subproject commit f6780a36ff19b36abcdb5ace903c4ae2272fb574 diff --git a/Makefile.inc b/Makefile.inc -index c5ce30f2b1..919a5d4ac1 100644 +index 413f7ad..ed2d839 100644 --- a/Makefile.inc +++ b/Makefile.inc -@@ -183,17 +183,6 @@ ifeq ($(CONFIG_COVERAGE),y) +@@ -191,18 +191,6 @@ ifeq ($(CONFIG_COVERAGE),y) ramstage-c-ccopts += -fprofile-arcs -ftest-coverage endif @@ -111,12 +108,13 @@ index c5ce30f2b1..919a5d4ac1 100644 -# unless explicitly requested and enabled through --checkout -forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs)) -endif --export UPDATED_SUBMODULES:=1 +-UPDATED_SUBMODULES:=1 +-COREBOOT_EXPORTS += UPDATED_SUBMODULES -endif - + postcar-c-deps:=$$(OPTION_TABLE_H) ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) - libverstage-c-deps:=$$(OPTION_TABLE_H) -- -2.11.0 +1.9.1 |