From 939ad535972b01732c1d2d398a67732834a39695 Mon Sep 17 00:00:00 2001 From: wangjianxin Date: Wed, 28 May 2025 15:06:02 +0800 Subject: [PATCH] can buildimage --- .../canaan_k230_sdk/canaan_k230_sdk.mk | 10 +++++++-- general/scripts/canaan_k230_post-image.sh | 21 +++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/general/package/canaan_k230_sdk/canaan_k230_sdk.mk b/general/package/canaan_k230_sdk/canaan_k230_sdk.mk index bbcd9ba7..4c8b73b8 100644 --- a/general/package/canaan_k230_sdk/canaan_k230_sdk.mk +++ b/general/package/canaan_k230_sdk/canaan_k230_sdk.mk @@ -6,15 +6,21 @@ CANAAN_K230_SDK_SITE = CANAAN_K230_SDK_SOURCE = -CANAAN_K230_SDK_EXTRA_DOWNLOADS :=$(shell \ +k230_download_url := $(shell \ if curl --output /dev/null --silent --head --fail https://ai.b-bug.org/~/wangjianxin/ ;then \ - echo "https://ai.b-bug.org/~/wangjianxin/rootfs.tar.xz";\ + echo "https://ai.b-bug.org/~/wangjianxin/"; \ else \ echo "https://kendryte-download.canaan-creative.com/k230/downloads/kmodel";\ fi ; ) + +CANAAN_K230_SDK_EXTRA_DOWNLOADS := $(k230_download_url)/sysimage-sdcard.img.gz +CANAAN_K230_SDK_EXTRA_DOWNLOADS += $(k230_download_url)/rootfs.tar.xz + define CANAAN_K230_SDK_INSTALL_TARGET_CMDS tar -xf $(CANAAN_K230_SDK_DL_DIR)/rootfs.tar.xz -C $(TARGET_DIR) + rm -rf $(TARGET_DIR)/var/run; + gunzip -f -k -c $(CANAAN_K230_SDK_DL_DIR)/sysimage-sdcard.img.gz > $(BINARIES_DIR)/sysimage-sdcard.img endef diff --git a/general/scripts/canaan_k230_post-image.sh b/general/scripts/canaan_k230_post-image.sh index 74327bea..2a7a3137 100755 --- a/general/scripts/canaan_k230_post-image.sh +++ b/general/scripts/canaan_k230_post-image.sh @@ -7,17 +7,10 @@ date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${ echo BUILD_OPTION=${OPENIPC_VARIANT} >> ${FILE} date +TIME_STAMP=%s >> ${FILE} -CONF="USES_GLIBC=y|OSDRV_T30=y|OSDRV_V85X=y|LIBV4L=y|MAVLINK_ROUTER=y|RUBYFPV=y|WIFIBROADCAST=y|WIFIBROADCAST_NG=y|AUDIO_PROCESSING_OPENIPC=y" -if ! grep -qP ${CONF} ${BR2_CONFIG}; then - rm -f ${TARGET_DIR}/usr/lib/libstdc++* -fi - -if grep -q "USES_MUSL=y" ${BR2_CONFIG}; then - ln -sf libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 - ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd -fi - -LIST="${BR2_EXTERNAL_GENERAL_PATH}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_VARIANT}.list" -if [ -f ${LIST} ]; then - xargs -a ${LIST} -I % rm -f ${TARGET_DIR}% -fi +cd ${BINARIES_DIR} +ext4_pos="$(fdisk -l sysimage-sdcard.img | grep sysimage-sdcard.img2 | cut -d ' ' -f2)" +dd if=rootfs.ext4 of=sysimage-sdcard.img seek=${ext4_pos} conv=notrunc +gzip -k -f sysimage-sdcard.img +chmod a+r sysimage-sdcard.img.gz +cd - +echo -e "k230 image is \033[31m ${BINARIES_DIR}/sysimage-sdcard.img.gz \033[0m"