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

update script

Browse Source
This commit is contained in:
superconvert 2022-10-25 23:24:44 +08:00
parent b4153d2f65
commit 5d1564b38a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
02_build_img.sh
View File

@ -319,7 +319,7 @@ if [ "${with_xfce}" = true ]; then
echo "2add25d2f5994832ba171755bc21f9fe" > ${diskfs}/usr/local/var/lib/dbus/machine-id
# 这些本来需要编译完成，目前暂且拷贝
cp /usr/lib/x86_64-linux-gnu/libLLVM-10.so.1 build/xfce_install/usr/lib/x86_64-linux-gnu/
# cp /usr/lib/x86_64-linux-gnu/libLLVM-10.so.1 build/xfce_install/usr/lib/x86_64-linux-gnu/
# 拷贝 xfce4 到镜像目录
cp ${xfce_install}/* ${diskfs} -r -n
@ -459,8 +459,10 @@ losetup -d ${loop_dev}
#---------------------------------------------------------------
#
# 转换为 vmware 格式, 虚拟机的磁盘类型一定设置为 SATA ，否则启动失败
# SCSI 格式转换, 命令查询 : qemu-img convert -O vmdk -o ?
# 需要二次转换 vmkfstools -i 11.vmdk esxi-compatible.vmdk
#
#---------------------------------------------------------------
qemu-img convert disk.img -f raw -O vmdk disk.vmdk
qemu-img convert disk.img -f raw -O vmdk disk_ide.vmdk
echo "Run the next script: 03_run_qemu.sh or 04_run_docker.sh"

6
mk_xfce.sh
View File

@ -638,7 +638,7 @@ common_build() {
}
#----------------------------------------------------------------------------------------------------------------
# llvm 编译
# llvm 编译，debug 对编译太挑剔，目前改成 release ，即使 swap 改成 32G ，还是经常被 kill
#----------------------------------------------------------------------------------------------------------------
llvm_build() {
local name=$1
@ -647,7 +647,7 @@ llvm_build() {
shift
if [ ! -f .${name} ]; then
echo "${CYAN}build ${name} begin${NC}" && cd ${srcdir} && mkdir -pv build && cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -G "Unix Makefiles"
if [ -f ./configure ]; then
./configure ${cfg_opt} "$@" ${xwin_opt}
fi
@ -807,7 +807,7 @@ llvm_build() {
# 编译基础库 ( 这些都是系统库，新系统需要集成 )
if [ "${with_xfce}" = true ] && [ "$1" = "img" ]; then
# 编译 llvm ( swrast 依赖此库，可以加大 swap 分区，编译时对内存要求极高 )
# llvm_build llvm ${LLVM_SRC_DIR}
llvm_build llvm ${LLVM_SRC_DIR}
# 编译 expat
common_build expat ${EXPAT_SRC_DIR}
# 编译 ncurses ( libtinfo.so.5 )