Skip to content

Remove git clone depth limitation and fix GPG key issue for sophgo.my-ho.st #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZehuaMc wants to merge 2 commits into
base: fix
Choose a base branch
from
Open

Remove git clone depth limitation and fix GPG key issue for sophgo.my-ho.st #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4396935
Removed git clone depth limitation
ZehuaMc Dec 1, 2024
b23e966
Fix GPG key issue for sophgo.my-ho.st package repository
ZehuaMc Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

Expand Down Expand Up @@ -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 $@

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 $@

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
deb http://deb.debian.org/debian sid main non-free-firmware
deb https://sophgo.my-ho.st:8443/ debian sophgo
deb https://sophgo.my-ho.st/ debian sophgo
EOF

echo "/boot/uboot.env 0x0000 0x20000" > /etc/fw_env.config
Expand Down