mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-18 08:06:32 +00:00
feat: 支持动态链接 (#910)
* feat: 支持动态链接 Authored-By: chiichen <chiichen@qq.com> Co-authored-by: longjin <longjin@DragonOS.org> Signed-off-by: longjin <longjin@DragonOS.org> * build: 更新构建容器版本至v1.12并指定DADK安装版本 - 将BUILD_CONTAINER_VERSION从v1.11升级到v1.12 - 修改bootstrap.sh和user/Makefile中DADK的安装方式,明确指定版本v0.4.0 Signed-off-by: longjin <longjin@DragonOS.org> --------- Signed-off-by: longjin <longjin@dragonos.org> Co-authored-by: chiichen <chiichen@qq.com> Co-authored-by: longjin <longjin@dragonos.org> Co-authored-by: Jomo <xuzihao@dragonos.org> Co-authored-by: MemoryShore <1353318529@qq.com>
This commit is contained in:
@ -1 +1 @@
|
||||
v1.11
|
||||
v1.12
|
@ -338,7 +338,7 @@ rustInstall
|
||||
install_python_pkg
|
||||
|
||||
# 安装dadk
|
||||
cargo install dadk || exit 1
|
||||
cargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v0.4.0 || exit 1
|
||||
|
||||
bashpath=$(cd `dirname $0`; pwd)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
docker rm -f dragonos-build || echo "No existed container"
|
||||
cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l)
|
||||
docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.11 bash << EOF
|
||||
docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.12 bash << EOF
|
||||
source ~/.cargo/env
|
||||
source ~/.bashrc
|
||||
cd /data
|
||||
|
@ -79,6 +79,9 @@ $DADK -w $root_folder rootfs mount || exit 1
|
||||
LOOP_DEVICE=$($DADK -w $root_folder rootfs show-loop-device || exit 1)
|
||||
echo $LOOP_DEVICE
|
||||
echo ${mount_folder}
|
||||
|
||||
FS_TYPE=$(findmnt -n -o FSTYPE ${mount_folder} || df -T ${mount_folder} | tail -1 | awk '{print $2}')
|
||||
echo "FS_TYPE: $FS_TYPE"
|
||||
# mkdir -p ${GRUB_INSTALL_PATH}
|
||||
|
||||
# 检测grub文件夹是否存在
|
||||
@ -99,7 +102,12 @@ mkdir -p ${mount_folder}/bin
|
||||
mkdir -p ${mount_folder}/dev
|
||||
mkdir -p ${mount_folder}/proc
|
||||
mkdir -p ${mount_folder}/usr
|
||||
cp -r ${root_folder}/bin/sysroot/* ${mount_folder}/
|
||||
|
||||
if [ "$FS_TYPE" = "vfat" ] || [ "$FS_TYPE" = "fat32" ]; then
|
||||
cp -rL ${root_folder}/bin/sysroot/* ${mount_folder}/
|
||||
else
|
||||
cp -r ${root_folder}/bin/sysroot/* ${mount_folder}/
|
||||
fi
|
||||
|
||||
# 设置 grub 相关数据
|
||||
if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then
|
||||
|
Reference in New Issue
Block a user