From 8d721f55cede93f9be898340b873b3a70d6a0d7a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 30 Mar 2023 09:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=BC=96=E8=AF=91=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 5 +- .project/envsetup.sh | 76 ++++++++++++++++++++++ .project/envsetuppc.sh | 17 +++++ .project/packet.sh | 10 +++ README.md | 16 ++--- boardinit.sh | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ build.sh | 1 + iflybuild | 1 + sh/boardinit.sh | 173 ------------------------------------------------- sh/envsetup.sh | 76 ---------------------- sh/envsetuppc.sh | 17 ----- sh/iflytool.sh | 1 - sh/packet.sh | 13 ---- 13 files changed, 290 insertions(+), 289 deletions(-) create mode 100755 .project/envsetup.sh create mode 100755 .project/envsetuppc.sh create mode 100755 .project/packet.sh create mode 100755 boardinit.sh create mode 120000 build.sh create mode 160000 iflybuild delete mode 100755 sh/boardinit.sh delete mode 100755 sh/envsetup.sh delete mode 100755 sh/envsetuppc.sh delete mode 120000 sh/iflytool.sh delete mode 100755 sh/packet.sh diff --git a/.gitmodules b/.gitmodules index 7facb89..70c103d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,4 +21,7 @@ url = ../../z2nd_lib/zclipp.git [submodule "dep/zlinuxcomponents"] path = dep/zlinuxcomponents - url = zwsd@192.168.1.3:z2nd_lib/zlinuxcomponents.git \ No newline at end of file + url = zwsd@192.168.1.3:z2nd_lib/zlinuxcomponents.git +[submodule "iflybuild"] + path = iflybuild + url = zwsd@192.168.1.3:z2nd_lib/iflybuild.git diff --git a/.project/envsetup.sh b/.project/envsetup.sh new file mode 100755 index 0000000..24ed9ff --- /dev/null +++ b/.project/envsetup.sh @@ -0,0 +1,76 @@ +#!/bin/bash +# 全局变量 + +# Config +CONFIG_SUPPORT_ALSA=true +CONFIG_SUPPORT_FFMPEG=true +CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS=true +CONFIG_SUPPORT_IXWEBSOCKET=true + +# Code Begin +mkdir -p ${LIBSDIR} +cd ${LIBSDIR} + +# 下载依赖库 +# CONFIG_SUPPORT_ALSA +if [ "$CONFIG_SUPPORT_ALSA" = true ]; then + wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libasound2_dev1.1.3-5ubuntu0.6.tar.gz" + wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libz.tar.gz" + rm -rf ${LIBSDIR}/alsa + rm -rf libasound2_dev1.1.3-5ubuntu0.6 + + tar -xvf libasound2_dev1.1.3-5ubuntu0.6.tar.gz >/dev/null + tar -xvf libz.tar.gz >/dev/null + + mkdir -p ${LIBSDIR}/alsa/pkgconfig/ + mkdir -p ${LIBSDIR}/alsa/include/sys/ + mkdir -p ${LIBSDIR}/alsa/lib/ + mkdir -p ${LIBSDIR}/alsa/include/sys/ + + mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/lib/aarch64-linux-gnu/libasound.* ${LIBSDIR}/alsa/lib/ + mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/lib/aarch64-linux-gnu/pkgconfig/alsa.pc ${LIBSDIR}/alsa/pkgconfig/ + mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/include/alsa ${LIBSDIR}/alsa/include/ + mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/include/sys/* ${LIBSDIR}/alsa/include/sys/ + + mv libz.so.1 ${LIBSDIR}/alsa/lib/ + + PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/alsa/lib" + PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/alsa/include" + PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound" +fi + +# CONFIG_SUPPORT_FFMPEG +if [ "$CONFIG_SUPPORT_FFMPEG" = true ]; then + wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/ffmpeg-4.1.10-aarch64-20230301.tar.gz" + rm -rf ${LIBSDIR}/ffmpeg + tar -xvf ffmpeg-4.1.10-aarch64-20230301.tar.gz >/dev/null + mv ffmpeg-4.1.10-aarch64-20230301 ${LIBSDIR}/ffmpeg + PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/ffmpeg/lib" + PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/ffmpeg/include" + PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale" +fi + +# CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS +if [ "$CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS" = true ]; then + wget -c "http://iflytop.local:8021/zlibrelease/libiflytop_voice_process/libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0.tar.gz" + tar -xvf libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0.tar.gz >/dev/null + + rm -rf ${LIBSDIR}/libiflytop_voice_process + mv libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0 ${LIBSDIR}/libiflytop_voice_process + PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libiflytop_voice_process/lib" + PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libiflytop_voice_process/include" + PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};iflytopvoice;NE10_static" +fi + +if [ "$CONFIG_SUPPORT_IXWEBSOCKET" = true ]; then + wget -c "http://iflytop.local:8021/zlibrelease/libixwebsocket/libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0.tar.gz" + tar -xvf libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0.tar.gz >/dev/null + rm -rf ${LIBSDIR}/libixwebsocket + mv libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0 ${LIBSDIR}/libixwebsocket + PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libixwebsocket/lib" + PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libixwebsocket/include" + PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};ixwebsocket" +fi + +CROSS_TOOLCHAIN_C_COMPILER=aarch64-linux-gnu-gcc +CROSS_TOOLCHAIN_CXX_COMPILER=aarch64-linux-gnu-g++ diff --git a/.project/envsetuppc.sh b/.project/envsetuppc.sh new file mode 100755 index 0000000..dd09990 --- /dev/null +++ b/.project/envsetuppc.sh @@ -0,0 +1,17 @@ +CONFIG_SUPPORT_IXWEBSOCKET=true + +mkdir -p ${LIBSDIR} +cd ${LIBSDIR} + +PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound" +PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale" + +if [ "$CONFIG_SUPPORT_IXWEBSOCKET" = true ]; then + wget -c "http://iflytop.local:8021/zlibrelease/libixwebsocket/libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0.tar.gz" + tar -xvf libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0.tar.gz >/dev/null + rm -rf ${LIBSDIR}/libixwebsocket + mv libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0 ${LIBSDIR}/libixwebsocket + PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libixwebsocket/lib" + PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libixwebsocket/include" + PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};ixwebsocket" +fi diff --git a/.project/packet.sh b/.project/packet.sh new file mode 100755 index 0000000..b1c836d --- /dev/null +++ b/.project/packet.sh @@ -0,0 +1,10 @@ +#!/bin/bash +#################################################################### +########################打包自定义的东西############################## +#################################################################### +# 下载唤醒词模型 +wget_and_unzip_to_packet_dir xiaomaoxiaomao ftp://zftpuser:zftpzwsd@192.168.1.2/zwsd/manufacturer_mycroft/hotworld/xiaomaoxiaomao/xiaomaoxiaomao_module_20220609.tar.gz +# 下载唤醒词引擎 +wget_and_unzip_to_packet_dir precise 192.168.1.2:8021/manufacturer_mycroft/mycroft-precise-release/precise-all_0.3.0_aarch64.tar.gz +# 下载唤醒词语音 +wget_and_cpy_to_packet_dir 192.168.1.2:8021/manufacturer_mycroft/hotworld/xiaomaoxiaomao/test_xiaomaoxiaomao.wav diff --git a/README.md b/README.md index c42a5d6..459f834 100644 --- a/README.md +++ b/README.md @@ -20,27 +20,27 @@ # 初始化环境 -./sh/iflytool.sh envsetup +./build.sh envsetup # 仅编译 -./sh/iflytool.sh build +./build.sh build # 编译调试版本，Cmake使用的是cmakepc.cmake -./sh/iflytool.sh buildpc +./build.sh buildpc # 编译打包部署（整包） -./sh/iflytool.sh --ip flash +./build.sh --ip flash # 编译打包部署,重启系统（整包） -./sh/iflytool.sh --ip flash reboot +./build.sh --ip flash reboot # 编译并只部署应用 -./sh/iflytool.sh --ip --flashapp "app.out" +./build.sh --ip --flashapp "app.out" # 只部署webapp -./sh/iflytool.sh --ip flashwebapp +./build.sh --ip flashwebapp # 配置ssh-key,免密登录 -./sh/iflytool.sh --ip ssh_copy_id +./build.sh --ip ssh_copy_id ``` diff --git a/boardinit.sh b/boardinit.sh new file mode 100755 index 0000000..6ab4794 --- /dev/null +++ b/boardinit.sh @@ -0,0 +1,173 @@ +#!/bin/bash + +function fixmac() { + #!/bin/bash + if [ $# -ne 1 ]; then + echo "Usage: $0 netcardname" + exit 1 + fi + + netcardname=$1 + + linkfilename=/etc/systemd/network/20-fixedmac-${netcardname}.link + + mac=$(ifconfig ${netcardname} | grep ether | awk '{print $2}') + + echo "[Match]" >${linkfilename} + echo "OriginalName=${netcardname}" >>${linkfilename} + echo "" >>${linkfilename} + echo "[Link]" >>${linkfilename} + echo "MACAddress=${mac}" >>${linkfilename} + + echo "++++++++++ create ${linkfilename} ++++++++++" + cat ${linkfilename} + echo "" +} + +function generate_device_info() { + # + # /etc/device_info.env + # DEVICE_ID=IFLYTOP_UNINITIALIZED + # FRP_SERVER_ADDR=127.0.0.1 + # + + # 判断DEVICE_ID和FRP_SERVER_ADDR是否为空 + if [ -z "$DEVICE_ID" ]; then + echo "DEVICE_ID is empty" + exit 1 + fi + + if [ -z "$FTP_SERVER_ADDR" ]; then + echo "FTP_SERVER_ADDR is empty" + exit 1 + fi + + echo "DEVICE_ID=${DEVICE_ID}" >/etc/device_info.env + echo "FRP_SERVER_ADDR=${FTP_SERVER_ADDR}" >>/etc/device_info.env + echo "AIUI_AUTH_ID=${AIUI_AUTH_ID}" >>/etc/device_info.env + echo "STARTUP_DEFAULT_URL=${STARTUP_DEFAULT_URL}" >>/etc/device_info.env + + echo "+++++++++ create /etc/device_info.env +++++++++" + cat /etc/device_info.env + echo "" + +} + +function update_frpc_config() { + # + # 当前这版本的FRPC的配置文件有问题，重新生成配置文件 + # + # [common] + # server_addr = {{ .Envs.FRP_SERVER_ADDR }} + # server_port = 7000 + # log_file = /var/log/frpc.log + # log_level = debug + # log_max_days = 3 + # login_fail_exit = false + # user = {{ .Envs.DEVICE_ID }} + # + # [ssh] + # type = tcp + # local_ip = 127.0.0.1 + # local_port = 22 + # remote_port = 0 + + echo "[common]" >/etc/frpc.ini + echo "server_addr = ${FTP_SERVER_ADDR}" >>/etc/frpc.ini + echo "server_port = 7000" >>/etc/frpc.ini + echo "log_file = /var/log/frpc.log" >>/etc/frpc.ini + echo "log_level = debug" >>/etc/frpc.ini + echo "log_max_days = 3" >>/etc/frpc.ini + echo "login_fail_exit = false" >>/etc/frpc.ini + echo "user = ${DEVICE_ID}" >>/etc/frpc.ini + echo "" >>/etc/frpc.ini + echo "[ssh]" >>/etc/frpc.ini + echo "type = tcp" >>/etc/frpc.ini + echo "local_ip = 127.0.0.1" >>/etc/frpc.ini + echo "local_port = 22" >>/etc/frpc.ini + echo "remote_port = 0" >>/etc/frpc.ini + + echo "+++++++++ create /etc/frpc.ini +++++++++" + cat /etc/frpc.ini + echo "" + + systemctl enable frpc.service + systemctl start frpc + +} + +set -e +DEVICE_ID="" +FTP_SERVER_ADDR="" +AIUI_AUTH_ID="" +FIX_MAC="" +STARTUP_DEFAULT_URL="" +PARAMETERS=$@ +EXEC_IN_BOARD=false + +for i in "$@"; do + case $i in + --deviceId) + shift + DEVICE_ID=$1 + shift + ;; + --ftpserver) + shift + FTP_SERVER_ADDR=$1 + shift + ;; + --fixmac) + shift + FIX_MAC=$1 + shift + ;; + + --aiui_auth_id) + shift + AIUI_AUTH_ID=$1 + shift + ;; + --exec_in_board) + shift + EXEC_IN_BOARD=$1 + shift + ;; + --ip) + shift + IP=$1 + shift + ;; + --startup_url) + shift + STARTUP_DEFAULT_URL=$1 + shift + ;; + *) + # unknown option + ;; + esac +done + +## 如果EXEC_IN_BOARD为空，则将自身拷贝到目标设备再次执行 +if [ "$EXEC_IN_BOARD" != "true" ]; then + echo "scp ./sh/boardinit.sh root@$IP:/tmp" + scp ./sh/boardinit.sh root@$IP:/tmp + echo "ssh root@$IP \"/tmp/boardinit.sh $PARAMETERS --exec_in_board true\"" + echo "" + ssh root@$IP "/tmp/boardinit.sh $PARAMETERS --exec_in_board true" + exit 0 +fi + +## 固化网卡 + +if [ "$FIX_MAC" == "true" ]; then + fixmac eth0 +fi + +generate_device_info + +# 翻转屏幕 +ff_rotate right + +update_frpc_config diff --git a/build.sh b/build.sh new file mode 120000 index 0000000..fe68a5d --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +iflybuild/build.sh \ No newline at end of file diff --git a/iflybuild b/iflybuild new file mode 160000 index 0000000..a2932b9 --- /dev/null +++ b/iflybuild @@ -0,0 +1 @@ +Subproject commit a2932b93bea8c07875593af7798c1d972505520a diff --git a/sh/boardinit.sh b/sh/boardinit.sh deleted file mode 100755 index 6ab4794..0000000 --- a/sh/boardinit.sh +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/bash - -function fixmac() { - #!/bin/bash - if [ $# -ne 1 ]; then - echo "Usage: $0 netcardname" - exit 1 - fi - - netcardname=$1 - - linkfilename=/etc/systemd/network/20-fixedmac-${netcardname}.link - - mac=$(ifconfig ${netcardname} | grep ether | awk '{print $2}') - - echo "[Match]" >${linkfilename} - echo "OriginalName=${netcardname}" >>${linkfilename} - echo "" >>${linkfilename} - echo "[Link]" >>${linkfilename} - echo "MACAddress=${mac}" >>${linkfilename} - - echo "++++++++++ create ${linkfilename} ++++++++++" - cat ${linkfilename} - echo "" -} - -function generate_device_info() { - # - # /etc/device_info.env - # DEVICE_ID=IFLYTOP_UNINITIALIZED - # FRP_SERVER_ADDR=127.0.0.1 - # - - # 判断DEVICE_ID和FRP_SERVER_ADDR是否为空 - if [ -z "$DEVICE_ID" ]; then - echo "DEVICE_ID is empty" - exit 1 - fi - - if [ -z "$FTP_SERVER_ADDR" ]; then - echo "FTP_SERVER_ADDR is empty" - exit 1 - fi - - echo "DEVICE_ID=${DEVICE_ID}" >/etc/device_info.env - echo "FRP_SERVER_ADDR=${FTP_SERVER_ADDR}" >>/etc/device_info.env - echo "AIUI_AUTH_ID=${AIUI_AUTH_ID}" >>/etc/device_info.env - echo "STARTUP_DEFAULT_URL=${STARTUP_DEFAULT_URL}" >>/etc/device_info.env - - echo "+++++++++ create /etc/device_info.env +++++++++" - cat /etc/device_info.env - echo "" - -} - -function update_frpc_config() { - # - # 当前这版本的FRPC的配置文件有问题，重新生成配置文件 - # - # [common] - # server_addr = {{ .Envs.FRP_SERVER_ADDR }} - # server_port = 7000 - # log_file = /var/log/frpc.log - # log_level = debug - # log_max_days = 3 - # login_fail_exit = false - # user = {{ .Envs.DEVICE_ID }} - # - # [ssh] - # type = tcp - # local_ip = 127.0.0.1 - # local_port = 22 - # remote_port = 0 - - echo "[common]" >/etc/frpc.ini - echo "server_addr = ${FTP_SERVER_ADDR}" >>/etc/frpc.ini - echo "server_port = 7000" >>/etc/frpc.ini - echo "log_file = /var/log/frpc.log" >>/etc/frpc.ini - echo "log_level = debug" >>/etc/frpc.ini - echo "log_max_days = 3" >>/etc/frpc.ini - echo "login_fail_exit = false" >>/etc/frpc.ini - echo "user = ${DEVICE_ID}" >>/etc/frpc.ini - echo "" >>/etc/frpc.ini - echo "[ssh]" >>/etc/frpc.ini - echo "type = tcp" >>/etc/frpc.ini - echo "local_ip = 127.0.0.1" >>/etc/frpc.ini - echo "local_port = 22" >>/etc/frpc.ini - echo "remote_port = 0" >>/etc/frpc.ini - - echo "+++++++++ create /etc/frpc.ini +++++++++" - cat /etc/frpc.ini - echo "" - - systemctl enable frpc.service - systemctl start frpc - -} - -set -e -DEVICE_ID="" -FTP_SERVER_ADDR="" -AIUI_AUTH_ID="" -FIX_MAC="" -STARTUP_DEFAULT_URL="" -PARAMETERS=$@ -EXEC_IN_BOARD=false - -for i in "$@"; do - case $i in - --deviceId) - shift - DEVICE_ID=$1 - shift - ;; - --ftpserver) - shift - FTP_SERVER_ADDR=$1 - shift - ;; - --fixmac) - shift - FIX_MAC=$1 - shift - ;; - - --aiui_auth_id) - shift - AIUI_AUTH_ID=$1 - shift - ;; - --exec_in_board) - shift - EXEC_IN_BOARD=$1 - shift - ;; - --ip) - shift - IP=$1 - shift - ;; - --startup_url) - shift - STARTUP_DEFAULT_URL=$1 - shift - ;; - *) - # unknown option - ;; - esac -done - -## 如果EXEC_IN_BOARD为空，则将自身拷贝到目标设备再次执行 -if [ "$EXEC_IN_BOARD" != "true" ]; then - echo "scp ./sh/boardinit.sh root@$IP:/tmp" - scp ./sh/boardinit.sh root@$IP:/tmp - echo "ssh root@$IP \"/tmp/boardinit.sh $PARAMETERS --exec_in_board true\"" - echo "" - ssh root@$IP "/tmp/boardinit.sh $PARAMETERS --exec_in_board true" - exit 0 -fi - -## 固化网卡 - -if [ "$FIX_MAC" == "true" ]; then - fixmac eth0 -fi - -generate_device_info - -# 翻转屏幕 -ff_rotate right - -update_frpc_config diff --git a/sh/envsetup.sh b/sh/envsetup.sh deleted file mode 100755 index 24ed9ff..0000000 --- a/sh/envsetup.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# 全局变量 - -# Config -CONFIG_SUPPORT_ALSA=true -CONFIG_SUPPORT_FFMPEG=true -CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS=true -CONFIG_SUPPORT_IXWEBSOCKET=true - -# Code Begin -mkdir -p ${LIBSDIR} -cd ${LIBSDIR} - -# 下载依赖库 -# CONFIG_SUPPORT_ALSA -if [ "$CONFIG_SUPPORT_ALSA" = true ]; then - wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libasound2_dev1.1.3-5ubuntu0.6.tar.gz" - wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libz.tar.gz" - rm -rf ${LIBSDIR}/alsa - rm -rf libasound2_dev1.1.3-5ubuntu0.6 - - tar -xvf libasound2_dev1.1.3-5ubuntu0.6.tar.gz >/dev/null - tar -xvf libz.tar.gz >/dev/null - - mkdir -p ${LIBSDIR}/alsa/pkgconfig/ - mkdir -p ${LIBSDIR}/alsa/include/sys/ - mkdir -p ${LIBSDIR}/alsa/lib/ - mkdir -p ${LIBSDIR}/alsa/include/sys/ - - mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/lib/aarch64-linux-gnu/libasound.* ${LIBSDIR}/alsa/lib/ - mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/lib/aarch64-linux-gnu/pkgconfig/alsa.pc ${LIBSDIR}/alsa/pkgconfig/ - mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/include/alsa ${LIBSDIR}/alsa/include/ - mv libasound2_dev1.1.3-5ubuntu0.6/unpack/usr/include/sys/* ${LIBSDIR}/alsa/include/sys/ - - mv libz.so.1 ${LIBSDIR}/alsa/lib/ - - PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/alsa/lib" - PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/alsa/include" - PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound" -fi - -# CONFIG_SUPPORT_FFMPEG -if [ "$CONFIG_SUPPORT_FFMPEG" = true ]; then - wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/ffmpeg-4.1.10-aarch64-20230301.tar.gz" - rm -rf ${LIBSDIR}/ffmpeg - tar -xvf ffmpeg-4.1.10-aarch64-20230301.tar.gz >/dev/null - mv ffmpeg-4.1.10-aarch64-20230301 ${LIBSDIR}/ffmpeg - PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/ffmpeg/lib" - PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/ffmpeg/include" - PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale" -fi - -# CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS -if [ "$CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS" = true ]; then - wget -c "http://iflytop.local:8021/zlibrelease/libiflytop_voice_process/libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0.tar.gz" - tar -xvf libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0.tar.gz >/dev/null - - rm -rf ${LIBSDIR}/libiflytop_voice_process - mv libiflytop_voice_process_v1.0_aarch64_ubuntu18.04_static_0 ${LIBSDIR}/libiflytop_voice_process - PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libiflytop_voice_process/lib" - PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libiflytop_voice_process/include" - PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};iflytopvoice;NE10_static" -fi - -if [ "$CONFIG_SUPPORT_IXWEBSOCKET" = true ]; then - wget -c "http://iflytop.local:8021/zlibrelease/libixwebsocket/libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0.tar.gz" - tar -xvf libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0.tar.gz >/dev/null - rm -rf ${LIBSDIR}/libixwebsocket - mv libixwebsocket_v11.4.3_aarch64_static_ubuntu18.04_0 ${LIBSDIR}/libixwebsocket - PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libixwebsocket/lib" - PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libixwebsocket/include" - PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};ixwebsocket" -fi - -CROSS_TOOLCHAIN_C_COMPILER=aarch64-linux-gnu-gcc -CROSS_TOOLCHAIN_CXX_COMPILER=aarch64-linux-gnu-g++ diff --git a/sh/envsetuppc.sh b/sh/envsetuppc.sh deleted file mode 100755 index dd09990..0000000 --- a/sh/envsetuppc.sh +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG_SUPPORT_IXWEBSOCKET=true - -mkdir -p ${LIBSDIR} -cd ${LIBSDIR} - -PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound" -PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale" - -if [ "$CONFIG_SUPPORT_IXWEBSOCKET" = true ]; then - wget -c "http://iflytop.local:8021/zlibrelease/libixwebsocket/libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0.tar.gz" - tar -xvf libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0.tar.gz >/dev/null - rm -rf ${LIBSDIR}/libixwebsocket - mv libixwebsocket_v11.4.3_amd64_static_ubuntu18.04_0 ${LIBSDIR}/libixwebsocket - PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/libixwebsocket/lib" - PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/libixwebsocket/include" - PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};ixwebsocket" -fi diff --git a/sh/iflytool.sh b/sh/iflytool.sh deleted file mode 120000 index 1eadf77..0000000 --- a/sh/iflytool.sh +++ /dev/null @@ -1 +0,0 @@ -../buildtools/iflytool.sh \ No newline at end of file diff --git a/sh/packet.sh b/sh/packet.sh deleted file mode 100755 index 7ed7c4c..0000000 --- a/sh/packet.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# wget_and_unzip 解压后的文件名 url -# -#################################################################### -########################打包自定义的东西############################## -#################################################################### -# 下载唤醒词模型 -wget_and_unzip_to_packet_dir xiaomaoxiaomao ftp://zftpuser:zftpzwsd@192.168.1.2/zwsd/manufacturer_mycroft/hotworld/xiaomaoxiaomao/xiaomaoxiaomao_module_20220609.tar.gz -# 下载唤醒词引擎 -wget_and_unzip_to_packet_dir precise 192.168.1.2:8021/manufacturer_mycroft/mycroft-precise-release/precise-all_0.3.0_aarch64.tar.gz -# 下载唤醒词语音 -wget_and_cpy_to_packet_dir 192.168.1.2:8021/manufacturer_mycroft/hotworld/xiaomaoxiaomao/test_xiaomaoxiaomao.wav