Add NanoKVM support

buildroot/DEVELOPERS

@@ -589,6 +589,7 @@ F:	package/fuse-overlayfs/
 F:	package/go/
 F:	package/go-bootstrap-stage1/
 F:	package/go-bootstrap-stage2/
+F:	package/go-bootstrap-stage3/
 F:	package/gocryptfs/
 F:	package/mbpfan/
 F:	package/moby-buildkit/

buildroot/board/cvitek/SG200X/overlay/etc/init.d/S30eth

@@ -2,16 +2,56 @@
 
 . /etc/profile
 
+# /boot/eth.nodhcp for example
+# ipaddr/net        gw[optional]
+# 192.168.0.101/24 192.168.0.1
+# 192.168.3.116/22  
+
+RESERVE_INET="192.168.0.1/24"
+
 start() {
 	printf "start ethernet: "
-	if [ ! -e /boot/eth.nodhcp ]
+	if [ -e /boot/eth.nodhcp ]
 	then
+		cat /boot/eth.nodhcp | while read inet gw
+		do
+		    addr=${inet%/*}
+		    netid=${inet#*/}
+		    [ -z $gw ] &&
+		    gw=$( echo $addr| ( IFS='.' read a b c d; echo $((
+		        (((((($a<<8)+$b)<<8)+$c)<<8)+$d)
+		            & (((1<<$netid)-1)<<(32-$netid))
+		        ))
+		    )) &&
+		    gw=$(($gw>>24&0xff)).$(($gw>>16&0xff)).$(($gw>>8&0xff)).$((1+( $gw>>0&0xff )))
+
+		    arping -Dqc2 -Ieth0 $addr || continue
+		    ip a add $inet brd + dev eth0
+		    ip r add default via $gw dev eth0
+		    cat > /etc/resolve.conf << EOF
+nameserver $gw
+nameserver 8.8.8.8
+nameserver 114.114.114.114
+EOF
+		    break
+		done &&
+		ip a show dev eth0|grep inet || (
+		    udhcpc -i eth0 -t 3 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid &>/dev/null
+		    ip a show dev eth0|grep inet
+		) || (
+		    # failed to apply dynamic addr, need a available static addr to visit the LAN
+		    inet=$RESERVE_INET
+		    addr=${inet%/*}
+		    ip a add $inet brd + dev eth0
+		) || exit 1
+	else
 		(udhcpc -i eth0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid) &
 	fi
 	echo "OK"
 }
 
 stop() {
+	[[ ! -e "/run/udhcpc.eth0.pid" ]] && echo "udhcpc is not running..." && exit 1
 	kill `cat /run/udhcpc.eth0.pid`
 	rm /run/udhcpc.eth0.pid
 }

buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig

@@ -579,6 +579,9 @@ BR2_PACKAGE_PYTHON_XLWT=y
 BR2_PACKAGE_PYTHON_XMODEM=y
 BR2_PACKAGE_PYTHON_ZEROCONF=y
 
+BR2_PACKAGE_HOST_PYTHON3=y
+BR2_PACKAGE_HOST_PYTHON3_SSL=y
+
 # BR2_PACKAGE_MGBA is not set
 # BR2_PACKAGE_GB_TEST_ROMS is not set
 

buildroot/package/Config.in

@@ -2806,6 +2806,10 @@ menu "Sipeed"
 	source "package/aic8800-sdio-firmware/Config.in"
 	source "package/cvitek-riscv64-musl-sysroot/Config.in"
 	source "package/lcdtest/Config.in"
+	source "package/maix-cdk/Config.in"
+	source "package/nanokvm-server/Config.in"
+	source "package/nanokvm-sg200x/Config.in"
+	source "package/tailscale-riscv64/Config.in"
 	source "package/tpudemo-sg200x/Config.in"
 	source "package/xuantie-gdb/Config.in"
 	source "package/sg2002-codec-firmware/Config.in"

buildroot/package/Config.in.host

@@ -46,6 +46,7 @@ menu "Host utilities"
 	source "package/go/Config.in.host"
 	source "package/go-bootstrap-stage1/Config.in.host"
 	source "package/go-bootstrap-stage2/Config.in.host"
+	source "package/go-bootstrap-stage3/Config.in.host"
 	source "package/google-breakpad/Config.in.host"
 	source "package/gptfdisk/Config.in.host"
 	source "package/imagemagick/Config.in.host"

buildroot/package/cvitek-riscv64-musl-sysroot/cvitek-riscv64-musl-sysroot.mk

@@ -4,8 +4,21 @@
 #
 ################################################################################
 
-CVITEK_RISCV64_MUSL_SYSROOT_VERSION = fb0a6ac7409fb477c5f46ced75bf05527def7cb9
-CVITEK_RISCV64_MUSL_SYSROOT_SITE = $(call github,0x754C,cvitek-riscv64-musl-sysroot,$(CVITEK_RISCV64_MUSL_SYSROOT_VERSION))
+CVITEK_RISCV64_MUSL_SYSROOT_VERSION = 1.0.0
+CVITEK_RISCV64_MUSL_SYSROOT_SITE = $(TOPDIR)/package/cvitek-riscv64-musl-sysroot
+CVITEK_RISCV64_MUSL_SYSROOT_SITE_METHOD = local
+
+define CVITEK_RISCV64_MUSL_SYSROOT_BUILD_CMDS
+	rm -f $(@D)/Config*
+	rm -f $(@D)/*.mk
+	mkdir -pv $(@D)/usr/lib/
+	if [ ! -e $(@D)/lib ]; then \
+		ln -s usr/lib $(@D)/lib ; \
+	fi
+	if [ -e $(realpath $(TOOLCHAIN_EXTERNAL_BIN)../sysroot/lib) ]; then \
+		rsync -r --verbose --copy-dirlinks --copy-links --hard-links $(realpath $(TOOLCHAIN_EXTERNAL_BIN)../sysroot/lib)/ld-*.so* $(@D)/usr/lib/ ; \
+	fi
+endef
 
 define CVITEK_RISCV64_MUSL_SYSROOT_INSTALL_TARGET_CMDS
 	rsync -av ${@D}/* $(TARGET_DIR)/

buildroot/package/go-bootstrap-stage2/go-bootstrap-stage2.hash

@@ -1,3 +1,3 @@
 # From https://go.dev/dl
-sha256  e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489  go1.19.11.src.tar.gz
+sha256  ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3  go1.19.13.src.tar.gz
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE

buildroot/package/go-bootstrap-stage2/go-bootstrap-stage2.mk

@@ -6,7 +6,7 @@
 
 # Use last Go version that go-bootstrap-stage1 can build: v1.19.x
 # See https://golang.org/doc/install/source#bootstrapFromSource
-GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11
+GO_BOOTSTRAP_STAGE2_VERSION = 1.19.13
 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang
 GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz
 

buildroot/package/go-bootstrap-stage3/0001-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch

@@ -0,0 +1,71 @@
+From 6b05378097c6a386ed9912d2471976dc39504e86 Mon Sep 17 00:00:00 2001
+From: Christian Stewart <[email protected]>
+Date: Thu, 27 Jul 2023 21:28:47 -0700
+Subject: [PATCH] cmd/dist: set buildvcs=false when building go-bootstrap
+
+When building go-bootstrap as part of the make.bash process, the cmd/dist
+invokes the bootstrap Go compiler to build the go_bootstrap tool:
+
+${GOROOT_BOOTSTRAP}/bin/go install -tags=math_big_pure_go compiler_bootstrap purego bootstrap/cmd/...
+
+If there is an invalid .git directory in a parent of ${GOROOT_BOOTSTRAP},
+make.bash will fail. Reproduction of the issue:
+
+  mkdir go-issue-61620
+  cd ./go-issue-61620
+  wget https://go.dev/dl/go1.19.11.src.tar.gz
+  mkdir go-bootstrap
+  tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1
+  cd ./go-bootstrap/src/
+  bash make.bash
+  cd ../../
+  wget https://go.dev/dl/go1.20.6.src.tar.gz
+  mkdir go
+  tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1
+  printf "gitdir: ../../does/not/exist/.git" > ./.git
+  cd ./go/src/
+  GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash
+
+The build fails with the following error:
+
+  Building Go toolchain1 using [snip]/go-1.19.10.
+  error obtaining VCS status: exit status 128
+    Use -buildvcs=false to disable VCS stamping.
+  go tool dist: FAILED: [snip]/go-1.19.10/bin/go install -tags=math_big_pure_go \
+    compiler_bootstrap purego bootstrap/cmd/...: exit status 1
+
+This change unconditionally sets -buildvcs=false when compiling go-bootstrap. We
+don't need the revision information in those binaries anyway. Setting this flag
+was previously not done as we were unsure if the go-bootstrap compiler would be
+new enough to support the buildvcs build flag. Since Go 1.20.x, Go 1.19.x is the
+minimum version for go-bootstrap, and supports -buildvcs=false. We can now set
+-buildvcs=false without worrying about compatibility.
+
+Related: https://github.com/golang/go/issues/54852
+Fixes: https://github.com/golang/go/issues/61620
+
+Upstream: https://github.com/golang/go/pull/61621
+
+Signed-off-by: Christian Stewart <[email protected]>
+Signed-off-by: Romain Naour <[email protected]>
+---
+ src/cmd/dist/buildtool.go | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
+index a528d7aa76..3b411d6ebb 100644
+--- a/src/cmd/dist/buildtool.go
++++ b/src/cmd/dist/buildtool.go
+@@ -221,6 +221,9 @@ func bootstrapBuildTools() {
+ 	cmd := []string{
+ 		pathf("%s/bin/go", goroot_bootstrap),
+ 		"install",
++		// Fixes cases where an invalid .git is present in a parent of GOROOT_BOOTSTRAP.
++		// See: https://github.com/golang/go/issues/61620
++		"-buildvcs=false",
+ 		"-tags=math_big_pure_go compiler_bootstrap purego",
+ 	}
+ 	if vflag > 0 {
+--
+2.41.0
+

buildroot/package/go-bootstrap-stage3/Config.in.host

@@ -0,0 +1,4 @@
+config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS
+	bool
+	default y
+	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS

buildroot/package/go-bootstrap-stage3/go-bootstrap-stage3.hash

@@ -0,0 +1,3 @@
+# From https://go.dev/dl
+sha256  dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43  go1.21.8.src.tar.gz
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE

buildroot/package/go-bootstrap-stage3/go-bootstrap-stage3.mk

@@ -0,0 +1,54 @@
+################################################################################
+#
+# go-bootstrap-stage3
+#
+################################################################################
+
+# Use last Go version that go-bootstrap-stage2 can build: v1.21.x
+# See https://go.dev/doc/go1.22#bootstrap
+GO_BOOTSTRAP_STAGE3_VERSION = 1.21.8
+GO_BOOTSTRAP_STAGE3_SITE = https://storage.googleapis.com/golang
+GO_BOOTSTRAP_STAGE3_SOURCE = go$(GO_BOOTSTRAP_STAGE3_VERSION).src.tar.gz
+
+GO_BOOTSTRAP_STAGE3_LICENSE = BSD-3-Clause
+GO_BOOTSTRAP_STAGE3_LICENSE_FILES = LICENSE
+
+# Use go-bootstrap-stage2 to bootstrap.
+HOST_GO_BOOTSTRAP_STAGE3_DEPENDENCIES = host-go-bootstrap-stage2
+
+HOST_GO_BOOTSTRAP_STAGE3_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE3_VERSION)
+
+# The go build system is not compatible with ccache, so use
+# HOSTCC_NOCCACHE.  See https://github.com/golang/go/issues/11685.
+HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV = \
+	GO111MODULE=off \
+	GOCACHE=$(HOST_GO_HOST_CACHE) \
+	GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \
+	GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \
+	GOROOT="$(@D)" \
+	GOBIN="$(@D)/bin" \
+	GOOS=linux \
+	CC=$(HOSTCC_NOCCACHE) \
+	CXX=$(HOSTCXX_NOCCACHE) \
+	CGO_ENABLED=0
+
+define HOST_GO_BOOTSTRAP_STAGE3_BUILD_CMDS
+	cd $(@D)/src && \
+		$(HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v)
+endef
+
+define HOST_GO_BOOTSTRAP_STAGE3_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/go
+	$(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/gofmt
+
+	cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/
+
+	mkdir -p $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg
+	cp -a $(@D)/pkg/include $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/
+	cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/
+
+	# The Go sources must be installed to the host/ tree for the Go stdlib.
+	cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/
+endef
+
+$(eval $(host-generic-package))

buildroot/package/go/Config.in.host

@@ -2,7 +2,7 @@
 config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	bool
 	default y
-	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS
 	# See https://go.dev/doc/install/source#environment
 	# See src/go/build/syslist.go for the list of supported architectures
 	depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \
@@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS
 	bool
 	default y
-	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS

buildroot/package/go/go.hash

@@ -1,3 +1,3 @@
 # From https://go.dev/dl
-sha256  00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6  go1.21.7.src.tar.gz
+sha256  ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6  go1.22.5.src.tar.gz
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE

buildroot/package/go/go.mk

@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-GO_VERSION = 1.21.7
+GO_VERSION = 1.22.5
 GO_SITE = https://storage.googleapis.com/golang
 GO_SOURCE = go$(GO_VERSION).src.tar.gz
 
 GO_LICENSE = BSD-3-Clause
 GO_LICENSE_FILES = LICENSE
 GO_CPE_ID_VENDOR = golang
 
-HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2
+HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3
 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path
 HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache
 HOST_GO_ROOT = $(HOST_DIR)/lib/go
@@ -128,7 +128,7 @@ HOST_GO_HOST_ENV = \
 HOST_GO_MAKE_ENV = \
 	GO111MODULE=off \
 	GOCACHE=$(HOST_GO_HOST_CACHE) \
-	GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \
+	GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \
 	GOROOT_FINAL=$(HOST_GO_ROOT) \
 	GOROOT="$(@D)" \
 	GOBIN="$(@D)/bin" \

buildroot/package/maix-cdk/0000-add-distapps.sh.patch

@@ -0,0 +1,61 @@
+From 41f213a4fff2ea878ee888c99d38ed47cbe93476 Mon Sep 17 00:00:00 2001
+From: scpcom <[email protected]>
+Date: Sun, 27 Oct 2024 07:24:26 +0100
+Subject: [PATCH] add distapps.sh
+
+---
+ distapps.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100755 distapps.sh
+
+diff --git a/distapps.sh b/distapps.sh
+new file mode 100755
+index 0000000..723b1d7
+--- /dev/null
++++ b/distapps.sh
+@@ -0,0 +1,42 @@
++#!/bin/sh
++m=`dirname $0`
++t=${m}/dist
++rm -rf ${t}/maixapp/
++mkdir -p ${t}
++t=${t}/maixapp
++mkdir ${t}
++mkdir ${t}/lib
++mkdir ${t}/tmp
++l=${t}/lib
++echo "projects:"
++for d in $m/projects/app_* ; do
++  a=`dirname $d`
++  b=`basename $d | cut -d '_' -f 2-`
++  #if [ ! -e ${d}/dist/${b}_release/${b} ]; then
++  if [  -e ${a}/apps/${b}/${b} ]; then
++    echo $b
++    mkdir ${t}/${b}
++    rsync -avpPxH ${a}/apps/${b}/ ${t}/${b}/
++    chmod +x ${t}/${b}/${b}
++    if [ -d ${t}/${b}/dl_lib ]; then
++      rsync -avpPxH ${a}/apps/${b}/dl_lib/ ${l}/
++      rm -rf ${t}/${b}/dl_lib/
++      ln -s ../lib ${t}/${b}/dl_lib
++    fi
++  fi
++done
++echo "examples:"
++for d in $m/examples/* ; do
++  b=`basename $d`
++  if [  -e ${d}/dist/${b}_release/${b} ]; then
++    echo $b
++    mkdir ${t}/${b}
++    rsync -avpPxH ${d}/dist/${b}_release/ ${t}/${b}/
++    chmod +x ${t}/${b}/${b}
++    if [ -d ${t}/${b}/dl_lib ]; then
++      rsync -avpPxH ${d}/dist/${b}_release/dl_lib/ ${l}/
++      rm -rf ${t}/${b}/dl_lib/
++      ln -s ../lib ${t}/${b}/dl_lib
++   fi
++  fi
++done
+-- 
+2.34.1
+