amass/smart-os
1
0
Fork 0
mirror of https://github.com/superconvert/smart-os.git synced 2024-11-22 10:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update xfce script

Browse Source
This commit is contained in:
superconvert 2022-10-09 07:05:29 +08:00
parent 62d7211be2
commit 15fecf743f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
02_build_img.sh
View File

@ -200,6 +200,18 @@ if [ "${with_xfce}" = true ]; then
cp ${xfce_install}/* ${diskfs} -r -n cp ${xfce_install}/* ${diskfs} -r -n
echo "xinit /usr/local/bin/xfce4-session -- /usr/local/bin/Xorg :10" > ${diskfs}/xfce.sh echo "xinit /usr/local/bin/xfce4-session -- /usr/local/bin/Xorg :10" > ${diskfs}/xfce.sh
chmod +x ${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 才能执行成功 # xfce 需要系统内执行下面两句，保证键盘数据存在 Xorg :10 才能执行成功
# 1. 键盘数据 # 1. 键盘数据
# rm /usr/local/share/X11/xkb -rf # rm /usr/local/share/X11/xkb -rf

2
mk_xfce.sh
View File

@ -732,7 +732,7 @@ llvm_build() {
# 编译基础库 ( 这些都是系统库，新系统需要集成 ) # 编译基础库 ( 这些都是系统库，新系统需要集成 )
if [ "${with_xfce}" = true ] && [ "$1" = "img" ]; then if [ "${with_xfce}" = true ] && [ "$1" = "img" ]; then
# 编译 llvm ( swrast 依赖此库 ) # 编译 llvm ( swrast 依赖此库 )
llvm_build llvm ${LLVM_SRC_DIR} # llvm_build llvm ${LLVM_SRC_DIR}
# 编译 expat # 编译 expat
common_build expat ${EXPAT_SRC_DIR} common_build expat ${EXPAT_SRC_DIR}
# 编译 libudev # 编译 libudev