diff --git a/.gitignore b/.gitignore index d372c7b..dabe86e 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ Release/ # configuration file # *.ini log.txt +log.txt diff --git a/Dockerfile b/Dockerfile index 2574c24..7c261ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,23 @@ -FROM alpine:3.16 +FROM rust:1-slim-buster as programmer_build +LABEL maintainer="Ben V. Brown " +WORKDIR /usr/src +RUN apt-get update && apt-get install -y git pkg-config libudev-dev bc +RUN git clone https://github.com/Ralim/bestool.git +RUN cd /usr/src/bestool/bestool/ && cargo build --release + +FROM debian:buster LABEL maintainer="Ben V. Brown " -RUN apk add --no-cache gcc-arm-none-eabi newlib-arm-none-eabi make git bash + +RUN apt update && apt-get install -y make git bash curl tar bzip2 bc + WORKDIR /src # Git trust RUN git config --global --add safe.directory /src +# Grab arm compiler; we have to use this ancient one or else we get boot failures. Probably subtle link issues. -COPY . /src +RUN curl https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj +ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin" +WORKDIR /usr/src +COPY --from=programmer_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool +COPY . /usr/src diff --git a/docker-compose.yml b/docker-compose.yml index 971d7b9..05d42b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,10 @@ services: builder: stdin_open: true tty: true + privileged: true build: context: . command: /bin/bash volumes: - - ./:/src:Z + - ./:/usr/src:Z + - /dev/:/dev/ diff --git a/log.txt b/log.txt deleted file mode 100644 index b71c697..0000000 --- a/log.txt +++ /dev/null @@ -1,8 +0,0 @@ -MAKE START: 2022-11-28 10:41:11.124503821 -make[1]: Entering directory '/home/caoyin/doc/jisheng_code/js_customer_code/shenzhen_meng_23000yp/best2300yp_open_source/out/open_source' -------------------------------- -REVISION_INFO: 29b195e-dirty:open_source -------------------------------- -make[1]: Leaving directory '/home/caoyin/doc/jisheng_code/js_customer_code/shenzhen_meng_23000yp/best2300yp_open_source/out/open_source' -MAKE END: 2022-11-28 10:41:11.262680315 -MAKE TIME: 0.14 seconds diff --git a/platform/drivers/usb/usb_dev/lib/libusbdev.a b/platform/drivers/usb/usb_dev/lib/libusbdev.a new file mode 100644 index 0000000..316c44f Binary files /dev/null and b/platform/drivers/usb/usb_dev/lib/libusbdev.a differ diff --git a/services/anc_spp_tool/lib/libanc_spp_tool.a b/services/anc_spp_tool/lib/libanc_spp_tool.a new file mode 100644 index 0000000..201e8f6 Binary files /dev/null and b/services/anc_spp_tool/lib/libanc_spp_tool.a differ diff --git a/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a b/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a new file mode 100644 index 0000000..3bae84c Binary files /dev/null and b/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a differ diff --git a/services/bridge/lib/best2300p_libbridge_sbc_enc.a b/services/bridge/lib/best2300p_libbridge_sbc_enc.a new file mode 100644 index 0000000..85b30c6 Binary files /dev/null and b/services/bridge/lib/best2300p_libbridge_sbc_enc.a differ diff --git a/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a b/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a new file mode 100644 index 0000000..8d3b13c Binary files /dev/null and b/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a differ diff --git a/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a b/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a new file mode 100644 index 0000000..9fcd338 Binary files /dev/null and b/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a differ diff --git a/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a b/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a new file mode 100644 index 0000000..addaf49 Binary files /dev/null and b/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a differ diff --git a/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a b/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a new file mode 100644 index 0000000..6f5df8a Binary files /dev/null and b/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a differ diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a new file mode 100644 index 0000000..8186e2b Binary files /dev/null and b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a differ diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a new file mode 100644 index 0000000..ad18242 Binary files /dev/null and b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a differ diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a new file mode 100644 index 0000000..d64e769 Binary files /dev/null and b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a differ diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a new file mode 100644 index 0000000..9f3b37b Binary files /dev/null and b/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a differ diff --git a/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a b/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a new file mode 100644 index 0000000..ec82427 Binary files /dev/null and b/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a differ diff --git a/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a b/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a new file mode 100644 index 0000000..70fa739 Binary files /dev/null and b/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a differ diff --git a/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a b/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a new file mode 100644 index 0000000..15f316d Binary files /dev/null and b/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a differ diff --git a/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a b/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a new file mode 100644 index 0000000..998c8f4 Binary files /dev/null and b/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a differ diff --git a/services/multimedia/lib/best2300p_libmultimedia_cp.a b/services/multimedia/lib/best2300p_libmultimedia_cp.a new file mode 100644 index 0000000..e39df10 Binary files /dev/null and b/services/multimedia/lib/best2300p_libmultimedia_cp.a differ diff --git a/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a b/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a new file mode 100644 index 0000000..41b5e3b Binary files /dev/null and b/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a differ diff --git a/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a b/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a new file mode 100644 index 0000000..e187867 Binary files /dev/null and b/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a differ diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a b/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a new file mode 100644 index 0000000..dc80253 Binary files /dev/null and b/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a differ diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a b/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a new file mode 100644 index 0000000..5ef0b2f Binary files /dev/null and b/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a differ diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a b/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a new file mode 100644 index 0000000..adafbb2 Binary files /dev/null and b/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a differ diff --git a/utils/encrypt/lib/libcryption.a b/utils/encrypt/lib/libcryption.a new file mode 100644 index 0000000..27ad813 Binary files /dev/null and b/utils/encrypt/lib/libcryption.a differ diff --git a/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a b/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a new file mode 100644 index 0000000..6ae75f2 Binary files /dev/null and b/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a differ