diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88f6504..d973f51 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: - name: 配置引导镜像 run: | - ./redpill_tool_chain.sh config ${{matrix.platform}}-${{matrix.version}} + cp sample_user_config.json ${{matrix.platform}}_user_config.json # 调整VID和PID sed -i -e 's\0x0001\0x0002\g' -e 's\0x46f4\0x0002\g' ${{matrix.platform}}_user_config.json @@ -74,7 +74,7 @@ jobs: ./redpill_tool_chain.sh add https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/rpext-index.json - name: 添加 jumkey.dtb !!!Create your own device tree binary!!! - if: matrix.platform == 'ds920p' + if: matrix.platform == 'ds920p' || matrix.platform == 'ds1621p' run: | ./redpill_tool_chain.sh add https://github.com/jumkey/redpill-load/raw/develop/redpill-dtb/rpext-index.json echo '!!!Create your own device tree binary!!!' diff --git a/global_config.json b/global_config.json index a937353..84f6de8 100644 --- a/global_config.json +++ b/global_config.json @@ -23,7 +23,7 @@ "id": "ds3615xs-6.2.4-25556", "platform_name": "DS3615xs", "platform_version": "bromolow-6.2.4-25556", - "user_config_json": "bromolow_user_config.json", + "user_config_json": "ds3615xs_user_config.json", "docker_base_image": "debian:8-slim", "compile_with": "kernel", "redpill_lkm_make_target": "dev-v6", @@ -50,7 +50,7 @@ "id": "ds3615xs-7.0-41222", "platform_name": "DS3615xs", "platform_version": "bromolow-7.0-41222", - "user_config_json": "bromolow_user_config.json", + "user_config_json": "ds3615xs_user_config.json", "docker_base_image": "debian:8-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -77,7 +77,7 @@ "id": "ds3615xs-7.0.1-42218", "platform_name": "DS3615xs", "platform_version": "bromolow-7.0.1-42218", - "user_config_json": "bromolow_user_config.json", + "user_config_json": "ds3615xs_user_config.json", "docker_base_image": "debian:8-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -104,7 +104,7 @@ "id": "ds918p-6.2.4-25556", "platform_name": "DS918+", "platform_version": "apollolake-6.2.4-25556", - "user_config_json": "apollolake_user_config.json", + "user_config_json": "ds918p_user_config.json", "docker_base_image": "debian:8-slim", "compile_with": "kernel", "redpill_lkm_make_target": "dev-v6", @@ -131,7 +131,7 @@ "id": "ds918p-7.0-41890", "platform_name": "DS918+", "platform_version": "apollolake-7.0-41890", - "user_config_json": "apollolake_user_config.json", + "user_config_json": "ds918p_user_config.json", "docker_base_image": "debian:10-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -158,7 +158,7 @@ "id": "ds918p-7.0.1-42218", "platform_name": "DS918+", "platform_version": "apollolake-7.0.1-42218", - "user_config_json": "apollolake_user_config.json", + "user_config_json": "ds918p_user_config.json", "docker_base_image": "debian:10-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -185,7 +185,7 @@ "id": "ds3617xs-7.0.1-42218", "platform_name": "DS3617xs", "platform_version": "broadwell-7.0.1-42218", - "user_config_json": "broadwell_user_config.json", + "user_config_json": "ds3617xs_user_config.json", "docker_base_image": "debian:8-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -212,7 +212,7 @@ "id": "ds3622xsp-7.0.1-42218", "platform_name": "DS3622xs+", "platform_version": "broadwellnk-7.0.1-42218", - "user_config_json": "broadwellnk_user_config.json", + "user_config_json": "ds3622xsp_user_config.json", "docker_base_image": "debian:10-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", @@ -239,7 +239,7 @@ "id": "ds920p-7.0.1-42218", "platform_name": "DS920+", "platform_version": "geminilake-7.0.1-42218", - "user_config_json": "geminilake_user_config.json", + "user_config_json": "ds920p_user_config.json", "docker_base_image": "debian:10-slim", "compile_with": "toolkit_dev", "redpill_lkm_make_target": "dev-v7", diff --git a/redpill_tool_chain.sh b/redpill_tool_chain.sh index 0cc93e7..29d59a6 100755 --- a/redpill_tool_chain.sh +++ b/redpill_tool_chain.sh @@ -307,7 +307,7 @@ if [[ "${ACTION}" != "del" && "${ACTION}" != "add" && "${ID}" != "all" ]]; then REDPILL_LOAD_REPO=$(getValueByJsonPath ".redpill_load.source_url" "${BUILD_CONFIG}") REDPILL_LOAD_BRANCH=$(getValueByJsonPath ".redpill_load.branch" "${BUILD_CONFIG}") - EXTRACTED_KSRC="/${TARGET_PLATFORM}.linux*" + EXTRACTED_KSRC="/linux*" if [ "${COMPILE_WITH}" == "toolkit_dev" ]; then EXTRACTED_KSRC="/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${DSM_VERSION}/build/" fi @@ -341,9 +341,6 @@ case "${ACTION}" in ;; clean) clean ;; - config) cp sample_user_config.json ${USER_CONFIG_JSON} - echo "!!!edit '${USER_CONFIG_JSON}'!!!" - ;; *) if [ ! -z ${ACTION} ];then echo "Error: action ${ACTION} does not exist" echo ""