diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a657e87..547c1fd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,18 +82,19 @@ jobs: - name: 添加扩展驱动 if: matrix.platform != 'dva3221' run: | - ./redpill_tool_chain.sh add https://github.com/pocopico/redpill-load/raw/develop/redpill-boot-wait/rpext-index.json - ./redpill_tool_chain.sh add https://github.com/pocopico/redpill-load/raw/develop/redpill-acpid/rpext-index.json - ./redpill_tool_chain.sh add https://github.com/pocopico/redpill-load/raw/develop/redpill-virtio/rpext-index.json + ./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 - name: 添加扩展驱动[dva3221] if: matrix.platform == 'dva3221' run: | echo '等待整理兼容性扩展~😀' + ./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-boot-wait.json - name: 添加 Misc shell run: | - ./redpill_tool_chain.sh add https://github.com/pocopico/redpill-load/raw/master/redpill-misc/rpext-index.json + ./redpill_tool_chain.sh add https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-misc.json - name: 添加 jumkey.dtb !!!Create your own device tree binary!!! if: matrix.platform == 'ds920p' || matrix.platform == 'ds1621p' @@ -103,7 +104,8 @@ jobs: echo 'see https://github.com/pocopico/redpill-load/blob/develop/redpill-dtb/README.md' - name: 编译引导镜像 - run: ./redpill_tool_chain.sh auto ${{matrix.platform}}-${{matrix.version}} + run: | + ./redpill_tool_chain.sh auto ${{matrix.platform}}-${{matrix.version}} - name: 上传引导镜像到 github actions diff --git a/.gitignore b/.gitignore index 5a64c20..cb5cad0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.txz *.json -!sample_user_config.json \ No newline at end of file +!extensions/*.json +!sample_user_config.json diff --git a/extensions/redpill-acpid.json b/extensions/redpill-acpid.json new file mode 100644 index 0000000..e5e3626 --- /dev/null +++ b/extensions/redpill-acpid.json @@ -0,0 +1,39 @@ +{ + "id": "jumkey.acpid2", + "url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-acpid.json", + "info": { + "name": "ACPI Daemon v2", + "description": "ACPI Daemon v2 that handles power button events", + "author_url": "https://sourceforge.net/projects/acpid2/", + "packer_url": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid", + "help_url": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid" + }, + "releases": { + "ds3615xs_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal_v6.json", + "ds3615xs_41222": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3615xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3615xs_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3615xs_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3617xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3617xs_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3617xs_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds918p_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal_v6.json", + "ds918p_41890": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds918p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds918p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds918p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds920p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds920p_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds920p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds920p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds1621p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds1621p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds1621p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds2422p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds2422p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds2422p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3622xsp_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3622xsp_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json", + "ds3622xsp_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-acpid/recipes/universal.json" + } +} diff --git a/extensions/redpill-boot-wait.json b/extensions/redpill-boot-wait.json new file mode 100644 index 0000000..81827c3 --- /dev/null +++ b/extensions/redpill-boot-wait.json @@ -0,0 +1,41 @@ +{ + "id": "thethorgroup.boot-wait", + "url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-boot-wait.json", + "info": { + "name": "RedPill Bootwait", + "description": "Simple extension which stops the execution early waiting for the boot device to appear", + "packer_url": "https://github.com/RedPill-TTG/redpill-boot-wait", + "help_url": "https://github.com/RedPill-TTG/redpill-boot-wait" + }, + "releases": { + "ds920p_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds920p_42550": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds920p_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds920p_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds1621p_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds1621p_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds1621p_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds2422p_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds2422p_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds2422p_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3622xsp_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3622xsp_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3622xsp_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3615xs_25556": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3615xs_41222": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3615xs_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3615xs_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3615xs_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3617xs_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3617xs_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds3617xs_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "dva3221_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "dva3221_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "dva3221_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds918p_25556": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds918p_41890": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds918p_42218": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds918p_42621": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json", + "ds918p_42661": "https://github.com/RedPill-TTG/redpill-boot-wait/raw/master/recipes/universal.json" + } +} diff --git a/extensions/redpill-misc.json b/extensions/redpill-misc.json new file mode 100644 index 0000000..c0a5d1f --- /dev/null +++ b/extensions/redpill-misc.json @@ -0,0 +1,38 @@ +{ + "id": "redpill-misc", + "url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-misc.json", + "info": { + "name": "Misc shell", + "description": "Misc shell", + "author_url": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc", + "packer_url": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc", + "help_url": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc" + }, + "releases": { + "ds3615xs_25556": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3615xs_41222": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3615xs_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3615xs_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3615xs_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3617xs_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3617xs_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3617xs_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3622xsp_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3622xsp_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds3622xsp_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds1621p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds1621p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds1621p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "dva3221_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "dva3221_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "dva3221_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds918p_25556": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds918p_41890": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds918p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds918p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds918p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds920p_42218": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds920p_42621": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json", + "ds920p_42661": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc/recipes/universal.json" + } +} diff --git a/extensions/redpill-virtio.json b/extensions/redpill-virtio.json new file mode 100644 index 0000000..8112a2e --- /dev/null +++ b/extensions/redpill-virtio.json @@ -0,0 +1,40 @@ +{ + "id": "thethorgroup.virtio", + "url": "https://github.com/tossp/redpill-tool-chain/raw/master/extensions/redpill-virtio.json", + "info": { + "name": "VirtIO", + "description": "Adds VirtIO support for fast network/PCI/SCSI/network/console paravirtualization under QEmu (Proxmox, VirtualBox, virsh, and similar)", + "author_url": "https://www.linux-kvm.org/page/Virtio", + "packer_url": "https://github.com/RedPill-TTG/redpill-virtio", + "help_url": "" + }, + "releases": { + "ds3615xs_25556": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds3615xs_25556.json", + "ds3615xs_41222": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds3615xs_41222.json", + "ds3615xs_42218": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds3615xs_41222.json", + "ds3615xs_42621": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds3615xs_41222.json", + "ds3615xs_42661": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds3615xs_41222.json", + "ds918p_25556": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds918p_25556.json", + "ds918p_41890": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds918p_41890.json", + "ds918p_42218": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds918p_41890.json", + "ds918p_42621": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds918p_41890.json", + "ds918p_42661": "https://github.com/RedPill-TTG/redpill-virtio/raw/master/recipes/ds918p_41890.json", + "ds920p_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds920p_41890.json", + "ds920p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds920p_41890.json", + "ds920p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds920p_41890.json", + "ds920p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds920p_41890.json", + "ds1621p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds1621p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds1621p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds2422p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds2422p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds2422p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds1621p_41890.json", + "ds3617xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3617xs_41890.json", + "ds3617xs_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3617xs_41890.json", + "ds3617xs_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3617xs_41890.json", + "ds3622xsp_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3622xsp_41890.json", + "ds3622xsp_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3622xsp_41890.json", + "ds3622xsp_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3622xsp_41890.json", + "ds3622xsp_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-virtio/recipes/ds3622xsp_41890.json" + } +} diff --git a/redpill_tool_chain.sh b/redpill_tool_chain.sh index dd93ecd..7eafbe0 100755 --- a/redpill_tool_chain.sh +++ b/redpill_tool_chain.sh @@ -96,10 +96,7 @@ function runContainer(){ echo "Host path does not exist: ${HOST_PATH}" exit 1 fi - mkdir -p "${HOST_PATH}-${TARGET_PLATFORM}" - rm -rf "${HOST_PATH}-${TARGET_PLATFORM}" - cp -r "${HOST_PATH}" "${HOST_PATH}-${TARGET_PLATFORM}" - BINDS+="--volume $(realpath ${HOST_PATH}-${TARGET_PLATFORM}):${CONTAINER_PATH} " + BINDS+="--volume $(realpath ${HOST_PATH}):${CONTAINER_PATH} " done fi docker run --privileged --rm $( [ "${CMD}" == "run" ] && echo " --interactive") --tty \