mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-09 07:06:47 +00:00
chore: 修复编译镜像未能正确安装工具链的问题 (#1071)
Signed-off-by: longjin <longjin@DragonOS.org>
This commit is contained in:
parent
6e85059fbc
commit
c09af909c5
16
.github/workflows/makefile.yml
vendored
16
.github/workflows/makefile.yml
vendored
@ -11,14 +11,14 @@ jobs:
|
|||||||
name: Format check ${{ matrix.arch }}
|
name: Format check ${{ matrix.arch }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
container: dragonos/dragonos-dev:v1.7
|
container: dragonos/dragonos-dev:v1.8
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x86_64, riscv64]
|
arch: [x86_64, riscv64]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Running in dragonos/dragonos-dev:v1.7"
|
- run: echo "Running in dragonos/dragonos-dev:v1.8"
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Format check
|
- name: Format check
|
||||||
@ -35,14 +35,14 @@ jobs:
|
|||||||
name: Kernel static test ${{ matrix.arch }}
|
name: Kernel static test ${{ matrix.arch }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
container: dragonos/dragonos-dev:v1.7
|
container: dragonos/dragonos-dev:v1.8
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x86_64, riscv64]
|
arch: [x86_64, riscv64]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Running in dragonos/dragonos-dev:v1.7"
|
- run: echo "Running in dragonos/dragonos-dev:v1.8"
|
||||||
|
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
@ -55,10 +55,10 @@ jobs:
|
|||||||
|
|
||||||
build-x86_64:
|
build-x86_64:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: dragonos/dragonos-dev:v1.7
|
container: dragonos/dragonos-dev:v1.8
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Running in dragonos/dragonos-dev:v1.7"
|
- run: echo "Running in dragonos/dragonos-dev:v1.8"
|
||||||
|
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: build the DragonOS
|
- name: build the DragonOS
|
||||||
@ -77,10 +77,10 @@ jobs:
|
|||||||
|
|
||||||
build-riscv64:
|
build-riscv64:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: dragonos/dragonos-dev:v1.7
|
container: dragonos/dragonos-dev:v1.8
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Running in dragonos/dragonos-dev:v1.7"
|
- run: echo "Running in dragonos/dragonos-dev:v1.8"
|
||||||
|
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
@ -1 +1 @@
|
|||||||
v1.7
|
v1.8
|
@ -24,6 +24,7 @@ DEFAULT_INSTALL="false"
|
|||||||
export RUSTUP_DIST_SERVER=${RUSTUP_DIST_SERVER:-https://rsproxy.cn}
|
export RUSTUP_DIST_SERVER=${RUSTUP_DIST_SERVER:-https://rsproxy.cn}
|
||||||
export RUSTUP_UPDATE_ROOT=${RUSTUP_UPDATE_ROOT:-https://rsproxy.cn/rustup}
|
export RUSTUP_UPDATE_ROOT=${RUSTUP_UPDATE_ROOT:-https://rsproxy.cn/rustup}
|
||||||
export RUST_VERSION="${RUST_VERSION:-nightly-2024-11-05}"
|
export RUST_VERSION="${RUST_VERSION:-nightly-2024-11-05}"
|
||||||
|
export RUST_VERSION_OLD="${RUST_VERSION:-nightly-2024-07-23}"
|
||||||
|
|
||||||
banner()
|
banner()
|
||||||
{
|
{
|
||||||
@ -65,7 +66,7 @@ install_ubuntu_debian_pkg()
|
|||||||
lsb-release \
|
lsb-release \
|
||||||
llvm-dev libclang-dev clang gcc-multilib \
|
llvm-dev libclang-dev clang gcc-multilib \
|
||||||
gcc build-essential fdisk dosfstools dnsmasq bridge-utils iptables libssl-dev pkg-config \
|
gcc build-essential fdisk dosfstools dnsmasq bridge-utils iptables libssl-dev pkg-config \
|
||||||
sphinx make git
|
python3-sphinx make git
|
||||||
# 必须分开安装,否则会出现错误
|
# 必须分开安装,否则会出现错误
|
||||||
sudo "$1" install -y \
|
sudo "$1" install -y \
|
||||||
gcc-riscv64-unknown-elf gcc-riscv64-linux-gnu gdb-multiarch
|
gcc-riscv64-unknown-elf gcc-riscv64-linux-gnu gdb-multiarch
|
||||||
@ -233,21 +234,21 @@ rustInstall() {
|
|||||||
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引,请耐心等待..."
|
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引,请耐心等待..."
|
||||||
cargo install cargo-binutils
|
cargo install cargo-binutils
|
||||||
cargo install bpf-linker
|
cargo install bpf-linker
|
||||||
rustup toolchain install nightly-2024-11-05-x86_64-unknown-linux-gnu
|
|
||||||
rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu
|
rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||||
|
rustup toolchain install $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
|
||||||
rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||||
rustup component add rust-src --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
|
rustup component add rust-src --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
|
||||||
rustup target add x86_64-unknown-none --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
rustup target add x86_64-unknown-none --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||||
rustup target add x86_64-unknown-none --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
|
rustup target add x86_64-unknown-none --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
|
||||||
rustup target add x86_64-unknown-linux-musl --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
|
|
||||||
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||||
|
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
|
||||||
|
|
||||||
rustup toolchain install $RUST_VERSION-riscv64gc-unknown-linux-gnu --force-non-host
|
rustup toolchain install $RUST_VERSION-riscv64gc-unknown-linux-gnu --force-non-host
|
||||||
rustup toolchain install nightly-2024-11-05-riscv64gc-unknown-linux-gnu --force-non-host
|
rustup toolchain install $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu --force-non-host
|
||||||
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
|
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
|
||||||
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
|
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
|
||||||
rustup target add riscv64gc-unknown-none-elf --toolchain nightly-2024-11-05-riscv64gc-unknown-linux-gnu
|
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu
|
||||||
rustup target add riscv64imac-unknown-none-elf --toolchain nightly-2024-11-05-riscv64gc-unknown-linux-gnu
|
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu
|
||||||
|
|
||||||
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
|
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
|
||||||
rustup component add rust-src
|
rustup component add rust-src
|
||||||
@ -338,9 +339,9 @@ cargo install dadk || exit 1
|
|||||||
bashpath=$(cd `dirname $0`; pwd)
|
bashpath=$(cd `dirname $0`; pwd)
|
||||||
|
|
||||||
# 编译安装musl交叉编译工具链
|
# 编译安装musl交叉编译工具链
|
||||||
bash ${bashpath}/install_musl_gcc.sh || (echo "musl交叉编译工具链安装失败" && exit 1)
|
$SHELL ${bashpath}/install_musl_gcc.sh || (echo "musl交叉编译工具链安装失败" && exit 1)
|
||||||
# 编译安装grub
|
# 编译安装grub
|
||||||
bash ${bashpath}/grub_auto_install.sh || (echo "grub安装失败" && exit 1)
|
$SHELL ${bashpath}/grub_auto_install.sh || (echo "grub安装失败" && exit 1)
|
||||||
|
|
||||||
# 解决kvm权限问题
|
# 解决kvm权限问题
|
||||||
USR=$USER
|
USR=$USER
|
||||||
|
@ -2,7 +2,8 @@ echo "正在为rust换源"
|
|||||||
|
|
||||||
sparse="false"
|
sparse="false"
|
||||||
|
|
||||||
CONFIG_FILE=~/.cargo/config.toml
|
CARGO_HOME=${CARGO_HOME:-~/.cargo}
|
||||||
|
CONFIG_FILE=$CARGO_HOME/config.toml
|
||||||
# 创建父目录
|
# 创建父目录
|
||||||
if [ ! -d ~/.cargo ]; then
|
if [ ! -d ~/.cargo ]; then
|
||||||
mkdir -p ~/.cargo
|
mkdir -p ~/.cargo
|
||||||
|
Loading…
x
Reference in New Issue
Block a user