diff --git a/.gitignore b/.gitignore index 7782556c..be1e0c72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ /cmake-build-debug/ /bin/ -tools/arch/i386/bios/grub/* -tools/arch/i386/efi/grub/* -tools/arch/x86_64/efi/grub/* !.gitkeep DragonOS.iso .idea/ diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..7f6fa1ac --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,5 @@ +grub-2.06.tar.xz* +grub-2.06/ +arch/i386/legacy/grub/* +arch/i386/efi/grub/* +arch/x86_64/efi/grub/* \ No newline at end of file diff --git a/tools/arch/i386/bios/grub/.gitkeep b/tools/arch/i386/bios/grub/.gitkeep deleted file mode 100644 index c6a5447c..00000000 --- a/tools/arch/i386/bios/grub/.gitkeep +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore everything in this directory -* -# Except this file !.gitkeep diff --git a/tools/arch/i386/efi/grub/.gitkeep b/tools/arch/i386/efi/grub/.gitkeep deleted file mode 100644 index c6a5447c..00000000 --- a/tools/arch/i386/efi/grub/.gitkeep +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore everything in this directory -* -# Except this file !.gitkeep diff --git a/tools/arch/i386/legacy/.gitkeep b/tools/arch/i386/legacy/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/tools/arch/x86_64/efi/grub/.gitkeep b/tools/arch/x86_64/efi/grub/.gitkeep deleted file mode 100644 index c6a5447c..00000000 --- a/tools/arch/x86_64/efi/grub/.gitkeep +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore everything in this directory -* -# Except this file !.gitkeep diff --git a/tools/grub_auto_install.sh b/tools/grub_auto_install.sh index b84dafae..6d0432fb 100644 --- a/tools/grub_auto_install.sh +++ b/tools/grub_auto_install.sh @@ -1,12 +1,15 @@ #!/bin/bash grub_dir_i386_efi=arch/i386/efi/grub -grub_dir_i386_bios=arch/i386/bios/grub +grub_dir_i386_legacy=arch/i386/legacy/grub grub_dir_x86_64_efi=arch/x86_64/efi/grub -#编译核心数目 -nproc=8 + +mkdir -p ${grub_dir_i386_efi} +mkdir -p ${grub_dir_i386_legacy} +mkdir -p ${grub_dir_x86_64_efi} + #检测grub是否已经安装 -if [ -d ${grub_dir_i386_efi}/bin ] || [ -d ${grub_dir_i386_bios}/bin ] || [ -d ${grub_dir_x86_64_efi}/bin ] ; then +if [ -d ${grub_dir_i386_efi}/bin ] || [ -d ${grub_dir_i386_legacy}/bin ] && [ -d ${grub_dir_x86_64_efi}/bin ] ; then exit 0 fi #仅支持Ubuntu/Debain下的自动安装 @@ -15,45 +18,49 @@ if ! hash 2>/dev/null apt-get; then exit 0 fi #下载grub2.06 +if [ ! -f "grub-2.06.tar.xz" ]; then + wget https://mirrors.tuna.tsinghua.edu.cn/gnu/grub/grub-2.06.tar.xz || exit 1 +fi + echo "开始下载grub2.06" -wget https://ftp.gnu.org/gnu/grub/grub-2.06.tar.gz + echo "下载完成" -tar -xvzf grub-2.06.tar.gz +tar xvf grub-2.06.tar.xz #安装对应依赖 sudo apt-get update sudo apt-get install -y \ - make \ + make \ binutils \ - bison \ - gcc \ + bison \ + gcc \ gettext \ - flex\ - bison\ - automake\ - autoconf\ + flex \ + bison \ + automake \ + autoconf cd grub-2.06 echo "开始安装grub2.06" #编译安装三个版本的grub -./configure --target=i386 --prefix=$(dirname $PWD)/${grub_dir_i386_bios} -make -j $(nporc) -make install -make clean +./configure --target=i386 --prefix=$(dirname $PWD)/${grub_dir_i386_legacy} || exit 1 +make -j $(nproc) || exit 1 +make install || exit 1 +make clean || exit 1 -./configure --target=i386 --with-platform=efi --prefix=$(dirname $PWD)/${grub_dir_i386_efi} -make -j $(nporc) -make install -make clean +./configure --target=i386 --with-platform=efi --prefix=$(dirname $PWD)/${grub_dir_i386_efi} || exit 1 +make -j $(nproc) || exit 1 +make install || exit 1 +make clean || exit 1 -./configure --target=x86_64 --with-platform=efi --prefix=$(dirname $PWD)/${grub_dir_x86_64_efi} -make -j $(nporc) -make install +./configure --target=x86_64 --with-platform=efi --prefix=$(dirname $PWD)/${grub_dir_x86_64_efi} || exit 1 +make -j $(nproc) || exit 1 +make install || exit 1 cd .. #解除权限限制 -sudo chmod -R 777 ${grub_dir_i386_bios} +sudo chmod -R 777 ${grub_dir_i386_legacy} sudo chmod -R 777 ${grub_dir_i386_efi} sudo chmod -R 777 ${grub_dir_x86_64_efi} rm -rf grub-2.06 -rm grub-2.06.tar.gz +rm grub-2.06.tar.xz* echo "grub2.06安装完成" diff --git a/tools/write_disk_image.sh b/tools/write_disk_image.sh index 9483fe2d..8acee777 100644 --- a/tools/write_disk_image.sh +++ b/tools/write_disk_image.sh @@ -22,13 +22,13 @@ echo "开始写入磁盘镜像..." # toolchain -OS=`uname -s` -if [ "${OS}" == "Linux" ]; then - GRUB_PATH="$(dirname $(which grub-file))" -elif [ "${OS}" == "Darwin" ]; then - GRUB_PATH="${root_folder}/tools/grub-2.06/build/grub/bin" -fi -export PATH="${GRUB_PATH}:$PATH" + +GRUB_PATH_I386_LEGACY_INSTALL=${root_folder}/tools/arch/i386/legacy/grub/sbin/grub-install +GRUB_PATH_I386_EFI_INSTALL=${root_folder}/tools/arch/i386/efi/grub/sbin/grub-install +GRUB_PATH_X86_64_EFI_INSTALL=${root_folder}/tools/arch/x86_64/efi/grub/sbin/grub-install + +GRUB_PATH_I386_LEGACY_FILE=${root_folder}/tools/arch/i386/legacy/grub/bin/grub-file + # ==============检查文件是否齐全================ @@ -45,7 +45,7 @@ done # 如果是 i386/x86_64,需要判断是否符合 multiboot2 标准 if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then - if ${GRUB_PATH}/grub-file --is-x86-multiboot2 ${kernel}; then + if ${GRUB_PATH_I386_LEGACY_FILE} --is-x86-multiboot2 ${kernel}; then echo Multiboot2 Confirmed! else echo NOT Multiboot2! @@ -108,13 +108,13 @@ case "$1" in case "$2" in uefi) #uefi if [ ${ARCH} == "i386" ];then - ./arch/i386/efi/grub/sbin/grub-install --target=i386-efi --efi-directory=${mount_folder} --boot-directory=${boot_folder} --removable + ${GRUB_PATH_I386_EFI_INSTALL} --target=i386-efi --efi-directory=${mount_folder} --boot-directory=${boot_folder} --removable elif [ ${ARCH} == "x86_64" ];then - ./arch/x86_64/efi/grub/sbin/grub-install --target=x86_64-efi --efi-directory=${mount_folder} --boot-directory=${boot_folder} --removable + ${GRUB_PATH_X86_64_EFI_INSTALL} --target=x86_64-efi --efi-directory=${mount_folder} --boot-directory=${boot_folder} --removable fi ;; legacy) #传统bios - ./arch/i386/bios/grub/sbin/grub-install --target=i386-pc --boot-directory=${boot_folder} /dev/$LOOP_DEVICE + ${GRUB_PATH_I386_LEGACY_INSTALL} --target=i386-pc --boot-directory=${boot_folder} /dev/$LOOP_DEVICE ;; esac ;;