diff --git a/02_build_img.sh b/02_build_img.sh index b82fc81..6d2d724 100755 --- a/02_build_img.sh +++ b/02_build_img.sh @@ -118,6 +118,7 @@ mount --move /sys /mnt/sys mount --move /proc /mnt/proc mount --move /tmp /mnt/tmp # 切换到真正的磁盘系统上 rootfs ---> diskfs +export LD_LIBRARY_PATH="/lib:/lib64:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64:/usr/lib/x86_64-linux-gnu" exec switch_root /mnt /sbin/init EOF @@ -175,7 +176,12 @@ rm -rf ${diskfs}/init ${diskfs}/lost+found # 带有 xfce 编译器 if [ "${with_xfce}" = true ]; then echo "${RED} ... build xfce desktop${NC}" + rm ${xfce_install}/usr/local/share/X11/xkb -rf + ln -s /usr/share/X11/xkb ${xfce_install}/usr/local/share/X11 + mv ${xfce_install}/usr/local/lib/libpcre.so.1 ${xfce_install}/usr/local/lib/libpcre.so.3 cp ${xfce_install}/* ${diskfs} -r -n + echo "xinit /usr/local/bin/xfce4-session -- /usr/local/bin/Xorg :10" > ${diskfs}/xfce.sh + chmod +x ${diskfs}/xfce.sh # xfce 需要系统内执行下面两句,保证键盘数据存在 Xorg :10 才能执行成功 # 1. 键盘数据 # rm /usr/local/share/X11/xkb -rf @@ -252,12 +258,12 @@ chmod +x ${diskfs}/etc/init.d/rcS if [ "${with_login}" = true ]; then cat - > ${diskfs}/etc/profile << EOF export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -export LD_LIBRARY_PATH=/usr/lib:/usr/lib64:/usr/local/lib:/usr/lib/x86_64-linux-gnu +export LD_LIBRARY_PATH="/lib:/lib64:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64:/usr/lib/x86_64-linux-gnu" EOF else cat - > ${diskfs}/etc/bash.bashrc << EOF export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -export LD_LIBRARY_PATH=/usr/lib:/usr/lib64:/usr/local/lib:/usr/lib/x86_64-linux-gnu +export LD_LIBRARY_PATH="/lib:/lib64:/usr/lib:/usr/lib64:/usr/local/lib:/usr/local/lib64:/usr/lib/x86_64-linux-gnu" EOF fi diff --git a/common.sh b/common.sh index 5995483..f11d106 100755 --- a/common.sh +++ b/common.sh @@ -25,13 +25,13 @@ with_gcc=true with_xfce=true # 开启编译后 xfce 本地测试 -with_xfce_test=true +with_xfce_test=false # 是否挂载第二块硬盘 with_sdb=false # 是否登陆模式 -with_login=false +with_login=true #---------------------------------------------- # 公共目录 diff --git a/mk_xfce.sh b/mk_xfce.sh index 36ec1eb..646949e 100755 --- a/mk_xfce.sh +++ b/mk_xfce.sh @@ -38,8 +38,8 @@ PIXMAN_SRC_URL=https://www.cairographics.org/releases/pixman-0.40.0.tar.gz ZLIB_SRC_URL=https://nchc.dl.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.xz LIBPNG_SRC_URL=https://nchc.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz FREETYPE_SRC_URL=https://nchc.dl.sourceforge.net/project/freetype/freetype2/2.12.0/freetype-2.12.0.tar.xz -DEJAVUFONTS1_SRC_URL=https://nchc.dl.sourceforge.net/project/dejavu/dejavu/2.37/dejavu-fonts-ttf-2.37.tar.bz2 -DEJAVUFONTS2_SRC_URL=https://nchc.dl.sourceforge.net/project/dejavu/dejavu/2.37/dejavu-lgc-fonts-ttf-2.37.tar.bz2 +DEJAVUFONTS1_SRC_URL=https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-fonts-ttf-2.37.tar.bz2 +DEJAVUFONTS2_SRC_URL=https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-lgc-fonts-ttf-2.37.tar.bz2 LIBJPEGTURBO_SRC_URL=https://sourceforge.net/projects/libjpeg-turbo/files/2.1.0/libjpeg-turbo-2.1.0.tar.gz XKBCOMMON_SRC_URL=https://xkbcommon.org/download/libxkbcommon-1.4.1.tar.xz XTERM_SRC_URL=https://invisible-island.net/datafiles/release/xterm.tar.gz