update script

This commit is contained in:
superconvert 2022-09-27 14:16:11 +00:00
parent 2d13af3221
commit 56de968b9b
3 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@ fi
#LINUX_SRC_URL=https://kernel.org/pub/linux/kernel/v4.x/linux-4.14.9.tar.xz
LINUX_SRC_URL=https://mirror.bjtu.edu.cn/kernel/linux/kernel/v4.x/linux-4.14.9.tar.xz
#GLIBC_SRC_URL=https://ftp.gnu.org/gnu/glibc/glibc-2.32.tar.bz2
GLIBC_SRC_URL=https://mirrors.ustc.edu.cn/gnu/glibc/glibc-2.28.tar.xz
GLIBC_SRC_URL=https://mirrors.ustc.edu.cn/gnu/glibc/glibc-2.27.tar.xz
BUSYBOX_SRC_URL=https://busybox.net/downloads/busybox-1.34.1.tar.bz2
#GCC_SRC_URL=https://ftpmirror.gnu.org/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz
GCC_SRC_URL=https://mirrors.ustc.edu.cn/gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz

View File

@ -70,7 +70,6 @@ find rootfs/ -name "*.a" -exec rm -rf {} \;
if [ "${with_gcc}" = false ]; then
rm -rf rootfs/usr/include
else
echo "${RED} with-gcc tools --- you can build your world${NC}"
cp ${glibc_install}/usr/lib64/libc_nonshared.a rootfs/usr/lib64
fi
@ -167,7 +166,7 @@ echo "${CYAN}--- build diskfs ---${NC}"
cp rootfs/* ${diskfs} -r
# 带有 gcc 编译器
if [ "${with_gcc}" = true ]; then
echo "${RED} with-gcc tools --- you can build your world${NC}"
echo "${RED} ... build gcc tools${NC}"
cp ${gcc_install}/* ${diskfs} -r
cp ${binutils_install}/usr/x86_64-pc-linux-gnu/* ${diskfs} -r
fi
@ -175,13 +174,13 @@ rm -rf ${diskfs}/init ${diskfs}/lost+found
# 带有 xfce 编译器
if [ "${with_xfce}" = true ]; then
echo "${RED}build xfce desktop${NC}"
echo "${RED} ... build xfce desktop${NC}"
cp ${xfce_install}/* ${diskfs} -r -n
fi
# 测试用户登陆模式: root/123456
if [ "${with_login}" = true ]; then
echo "${RED} with-login --- it's an exciting time ${NC}"
echo "${RED} ... with-login${NC}"
./mk_login.sh ${diskfs}
fi

View File

@ -568,6 +568,7 @@ common_build() {
# 目前还不支持和 glibc 同时编译,因为如果编译链接 glibc ,可能需要全部依赖都做到源码编译,否则,可能编译过程中有问题
# 因为 apt install 安装的软件可能依赖系统自带的 glibc这边指定编译的 glibc ,就会导致链接器工作混乱。导致链接失败
# 因此编译 xfce 时,一定保证 glibc_install/lib64 目录为空,否则就会出现上面的错误 died with <Signals.SIGSEGV: 11>
# 高版本的 python 编译此工程也有问题, gtk 很多编译不过,需要手工改动
#
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!