From 439693528962450751501e8e432090e7704d5163 Mon Sep 17 00:00:00 2001 From: Tang Zehua Date: Sun, 1 Dec 2024 14:20:03 +0800 Subject: [PATCH 1/2] Removed git clone depth limitation --- scripts/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index a9d2058..e461c43 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -38,7 +38,7 @@ NPROCS := $(shell nproc) $(BUILDDIR)/linux-prepare-checkout-stamp: @echo "$(COLOUR_GREEN)Checking out Kernel for $(BOARD)$(END_COLOUR)" @mkdir -p $(BUILDDIR) - @git clone -b sg200x-dev --depth 7 https://github.com/sophgo/linux_5.10.git /build/kernel + @git clone -b sg200x-dev https://github.com/sophgo/linux_5.10.git /build/kernel @cd $(BUILDDIR)/kernel && git checkout e6ead53 @touch $@ @@ -79,7 +79,7 @@ linux-clean: $(BUILDDIR)/uboot-prepare-checkout-stamp: @echo "$(COLOUR_GREEN)Checking out U-Boot for $(BOARD)$(END_COLOUR)" @mkdir -p $(BUILDDIR) - @git clone --depth 1 https://github.com/sophgo/u-boot-2021.10.git $(BUILDDIR)/u-boot + @git clone https://github.com/sophgo/u-boot-2021.10.git $(BUILDDIR)/u-boot @cd $(BUILDDIR)/u-boot && git checkout 4a21b6b @touch $@ @@ -122,7 +122,7 @@ uboot-clean: $(BUILDDIR)/opensbi-prepare-checkout-stamp: @echo "$(COLOUR_GREEN)Checking out OpenSBI for $(BOARD)$(END_COLOUR)" @mkdir -p $(BUILDDIR) - @git clone -b sg200x-dev --depth 4 https://github.com/sophgo/opensbi.git $(BUILDDIR)/opensbi + @git clone -b sg200x-dev https://github.com/sophgo/opensbi.git $(BUILDDIR)/opensbi @cd $(BUILDDIR)/opensbi && git checkout 216793f # git clone https://github.com/riscv-software-src/opensbi.git $(BUILDDIR)/opensbi # @cd $(BUILDDIR)/opensbi && git checkout a2b255b @@ -151,7 +151,7 @@ opensbi-clean: $(BUILDDIR)/fsbl-prepare-checkout-stamp: @echo "$(COLOUR_GREEN)Checking out FSBL for $(BOARD)$(END_COLOUR)" @mkdir -p $(BUILDDIR) - @git clone -b sg200x-dev --depth 1 https://github.com/sophgo/fsbl.git $(BUILDDIR)/fsbl + @git clone -b sg200x-dev https://github.com/sophgo/fsbl.git $(BUILDDIR)/fsbl @cd $(BUILDDIR)/fsbl && git checkout 15a84c5 @touch $@ From b23e96670cf85077b1f7d5608e2211e7d343f64b Mon Sep 17 00:00:00 2001 From: Tang Zehua Date: Sun, 1 Dec 2024 14:32:11 +0800 Subject: [PATCH 2/2] Fix GPG key issue for sophgo.my-ho.st package repository --- scripts/Makefile | 2 +- scripts/setup_rootfs.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index e461c43..8b28a9c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -198,7 +198,7 @@ $(BUILDDIR)/image-prepare-stamp: @-rm $(addon-targets) @mkdir -p /rootfs/ @curl -v -L https://sophgo.my-ho.st/public-key.asc -o $(BUILDDIR)/public-key.asc - @mmdebstrap -v --architectures=riscv64 --include="$(_PACKAGES)" sid "/rootfs/" "deb http://deb.debian.org/debian/ sid main" "deb [signed-by=$(BUILDDIR)/public-key.asc] https://sophgo.my-ho.st:8443/ debian sophgo" + @mmdebstrap -v --architectures=riscv64 --include="$(_PACKAGES)" sid "/rootfs/" "deb http://deb.debian.org/debian/ sid main" "deb [signed-by=$(BUILDDIR)/public-key.asc] https://sophgo.my-ho.st/ debian sophgo" @touch $@ $(BUILDDIR)/image-addons-stamp: $(BUILDDIR)/image-prepare-stamp $(BUILDDIR)/fsbl-package-stamp $(BUILDDIR)/linux-compile-stamp $(addon-targets) diff --git a/scripts/setup_rootfs.sh b/scripts/setup_rootfs.sh index c657ec1..7ef79b1 100755 --- a/scripts/setup_rootfs.sh +++ b/scripts/setup_rootfs.sh @@ -145,11 +145,11 @@ fi rm -rf /etc/apt/sources.list.d/multistrap-debian.list #apt-key add /tmp/install/public-key.asc -cp /tmp/install/public-key.asc /etc/apt/trusted.gpg.d/sophgo-myho-st.gpg +cp /tmp/install/public-key.asc /etc/apt/trusted.gpg.d/sophgo-myho-st.asc cat > /etc/apt/sources.list < /etc/fw_env.config