Skip to content
This repository has been archived by the owner on Dec 10, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tossp/redpill-tool-chain
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: skill7899/redpill-tool-chain
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 4, 2023

  1. Update test.yml

    skill7899 authored Jan 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f6feb65 View commit details
  2. Update redpill-dtb.json

    skill7899 authored Jan 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    84bafe7 View commit details
  3. Update test.yml

    skill7899 authored Jan 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2172a4b View commit details
Showing with 7 additions and 42 deletions.
  1. +5 −40 .github/workflows/test.yml
  2. +2 −2 extensions/redpill-dtb.json
45 changes: 5 additions & 40 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -24,47 +24,9 @@ jobs:
matrix:
include:
# 两行一组,删除不需要的版本
- platform: ds1621p
version: 7.0.1-42218
- platform: ds1621p
version: 7.1.0-42661

- platform: ds2422p
version: 7.0.1-42218

- platform: ds3615xs
version: 6.2.4-25556
- platform: ds3615xs
version: 7.0.1-42218
- platform: ds3615xs
version: 7.1.0-42661

# - platform: ds3617xs
# version: 7.0.1-42218
- platform: ds3617xs
version: 7.1.0-42661

- platform: ds3622xsp
version: 7.0.1-42218
- platform: ds3622xsp
version: 7.1.0-42661

- platform: ds918p
version: 6.2.4-25556
- platform: ds918p
version: 7.0.1-42218
- platform: ds918p
version: 7.1.0-42661

- platform: ds920p
version: 7.0.1-42218
- platform: ds920p
version: 7.1.0-42661

# - platform: dva3221
# version: 7.0.1-42218
- platform: dva3221
version: 7.1.0-42661

steps:
- name: 检出项目文件
@@ -100,7 +62,7 @@ jobs:
# 调整SN和MAC,最好使用 actions secrets 引入,SN应该是固定值不应该每次生成
sn=`./redpill_tool_chain.sh sn ${{matrix.platform}} | grep 'Serial Number' | awk '{print $3}'`
sed -i -e "s/1234XXX123/${sn:="1130LWN123456"}/g" -e 's/XXYYXXYYXXYY/0011323D47F7/g' ${{matrix.platform}}_user_config.json
sed -i -e "s/1234XXX123/${sn:="1880PDN435101"}/g" -e 's/XXYYXXYYXXYY/00113294A6DA/g' ${{matrix.platform}}_user_config.json
# 添加第二张网卡mac并设置网卡数量
sed -i -e 's/0011323D47F7"/&,\n\t"mac2": "0011323D47F8",\n\t"netif_num": 2/' ${{matrix.platform}}_user_config.json
@@ -116,6 +78,9 @@ jobs:
./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-boot-wait.json
./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-acpid.json
./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-virtio.json
./redpill_tool_chain.sh add https://github.com/pocopico/rp-ext/raw/main/igbvf/rpext-index.json
./redpill_tool_chain.sh add https://github.com/pocopico/rp-ext/raw/main/ixgbevf/rpext-index.json
./redpill_tool_chain.sh add https://github.com/pocopico/rp-ext/raw/main/bnx2x/rpext-index.json
- name: 添加扩展驱动[dva3221]
if: matrix.platform == 'dva3221'
@@ -130,7 +95,7 @@ jobs:
- name: 添加 jumkey.dtb !!!Create your own device tree binary!!!
if: matrix.platform == 'ds920p' || matrix.platform == 'ds1621p' || matrix.platform == 'ds2422p'
run: |
./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-dtb.json
./redpill_tool_chain.sh add https://github.com/skill7899/redpill-tool-chain/raw/master/extensions/redpill-dtb.json
echo '!!!Create your own device tree binary!!!'
echo 'see https://github.com/jumkey/redpill-load/blob/develop/redpill-dtb/README.md'
4 changes: 2 additions & 2 deletions extensions/redpill-dtb.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "redpill-dtb",
"url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-dtb.json",
"url": "https://github.com/skill7899/redpill-tool-chain/raw/master/extensions/redpill-dtb.json",
"info": {
"name": "Device tree binary",
"description": "Create your own device tree binary",
@@ -12,7 +12,7 @@
"ds920p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds920p_42550": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds920p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds920p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds920p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds1621p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds1621p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",
"ds1621p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-dtb/recipes/universal.json",