:: commit b5c6bdcf102af5ac5941dcbc7bedc8e39bb2f68b

xvanc <xvancm@gmail.com> — 2024-05-30 22:35

parents: 65e2c1b4d8

build: switch to git repo for libfdt

diff --git a/.gitignore b/.gitignore
index cf494e93..b435b670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /common/cc-runtime
 /decompressor/tinf
 /decompressor/cc-runtime
+/dtc
 /tinf
 /stb
 /ovmf*
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2cdcb1fb..68d50536 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -337,7 +337,7 @@ distclean: clean
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h decompressor/tinf tinf stb freestanding-headers common/cc-runtime decompressor/cc-runtime limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h decompressor/tinf tinf stb dtc freestanding-headers common/cc-runtime decompressor/cc-runtime limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
 
 .PHONY: common-uefi-x86-64
 common-uefi-x86-64:
diff --git a/bootstrap b/bootstrap
index 7b2b26b6..64b9faed 100755
--- a/bootstrap
+++ b/bootstrap
@@ -17,6 +17,7 @@ LIMINE_EFI_COMMIT_HASH=0559deafcbfe62f291ca1e1f359c282e86bd99d6
 TINF_COMMIT_HASH=57ffa1f1d5e3dde19011b2127bd26d01689b694b
 FLANTERM_COMMIT_HASH=347d9cf1e3fced64aa20ab278e2fdcc834086035
 STB_COMMIT_HASH=f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe
+DTC_COMMIT_HASH=039a99414e778332d8f9c04cbd3072e1dcc62798
 
 AUXFILES="config.guess config.sub install-sh"
 
@@ -65,10 +66,9 @@ if ! [ -f version ]; then
     patch -p0 < common/stb_image.patch
     rm -f common/lib/stb_image.h.orig
 
-    curl -Lo dtc-1.7.0.tar.xz https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-1.7.0.tar.xz
-    tar -xf dtc-1.7.0.tar.xz
-    mv dtc-1.7.0/libfdt/ common/libfdt
-    rm -rf dtc-1.7.0 dtc-1.7.0.tar.xz
+    clone_repo_commit https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc $DTC_COMMIT_HASH
+    rm -rf common/libfdt
+    cp -rp dtc/libfdt common/
     find common/libfdt/ -type f -not -name '*.c' -not -name '*.h' -delete
     patch -p1 < common/libfdt.patch
 fi
tab: 248 wrap: offon