From 15fecf743febc54701463265b0a208c0e56879e9 Mon Sep 17 00:00:00 2001 From: superconvert Date: Sun, 9 Oct 2022 07:05:29 +0800 Subject: [PATCH] update xfce script --- 02_build_img.sh | 12 ++++++++++++ mk_xfce.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/02_build_img.sh b/02_build_img.sh index 2fbf403..b9da6d0 100755 --- a/02_build_img.sh +++ b/02_build_img.sh @@ -200,6 +200,18 @@ if [ "${with_xfce}" = true ]; then 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 + # 添加 machine-id + echo "2add25d2f5994832ba171755bc21f9fe" >> ${diskfs}/etc/machine-id + echo "2add25d2f5994832ba171755bc21f9fe" >> ${diskfs}/usr/local/var/lib/dbus/machine-id + # 这些本来需要编译完成，目前暂且拷贝 + cp /usr/lib/x86_64-linux-gnu/libLLVM-10.so.1 smart-os/build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libffi.so.6 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libedit.so.2 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /lib/x86_64-linux-gnu/libtinfo.so.5 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libsensors.so.4 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libdrm_radeon.so.1 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libdrm_amdgpu.so.1 build/xfce_install/usr/lib/x86_64-linux-gnu/ + cp /usr/lib/x86_64-linux-gnu/libdrm_nouveau.so.2 build/xfce_install/usr/lib/x86_64-linux-gnu/ # xfce 需要系统内执行下面两句，保证键盘数据存在 Xorg :10 才能执行成功 # 1. 键盘数据 # rm /usr/local/share/X11/xkb -rf diff --git a/mk_xfce.sh b/mk_xfce.sh index 9d2a6d9..e8500f3 100755 --- a/mk_xfce.sh +++ b/mk_xfce.sh @@ -732,7 +732,7 @@ llvm_build() { # 编译基础库 ( 这些都是系统库，新系统需要集成 ) if [ "${with_xfce}" = true ] && [ "$1" = "img" ]; then # 编译 llvm ( swrast 依赖此库 ) - llvm_build llvm ${LLVM_SRC_DIR} + # llvm_build llvm ${LLVM_SRC_DIR} # 编译 expat common_build expat ${EXPAT_SRC_DIR} # 编译 libudev