From 2d13af322190f37674373a25e871d2260715d18b Mon Sep 17 00:00:00 2001 From: superconvert Date: Mon, 26 Sep 2022 14:00:07 +0000 Subject: [PATCH] update script --- 01_build_src.sh | 2 +- 02_build_img.sh | 4 ++-- mk_xfce.sh | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/01_build_src.sh b/01_build_src.sh index ff4542d..dae31d3 100755 --- a/01_build_src.sh +++ b/01_build_src.sh @@ -161,7 +161,7 @@ cd .. # 编译 xfce [ no same time with xorg ] if [ "${with_xfce}" = true ]; then - ./mk_xfce.sh + ./mk_xfce.sh img fi echo "Run the next script: 02_build_img.sh" diff --git a/02_build_img.sh b/02_build_img.sh index 69a52d9..c34ef9e 100755 --- a/02_build_img.sh +++ b/02_build_img.sh @@ -18,9 +18,9 @@ echo "${CYAN}--- build disk --- ${NC}" # 创建磁盘 128M 或 256M if [ "${with_gcc}" = false ]; then - create_disk disk.img 128 + create_disk disk.img 1024 else - create_disk disk.img 256 + create_disk disk.img 1024 fi echo "${GREEN}+++ build disk ok +++${NC}" diff --git a/mk_xfce.sh b/mk_xfce.sh index 25a3f18..c8b8ee1 100755 --- a/mk_xfce.sh +++ b/mk_xfce.sh @@ -691,7 +691,9 @@ common_build() { # 编译 pango meson_build pango ${PANGO_SRC_DIR} # 编译 dbus-1( 我们的系统需要编译,如果在当前系统上运行 xfce4,需要注释掉,否则就会和系统自带的 dbus-1 冲突 ) - # common_build dbus-1 ${DBUS1_SRC_DIR} --disable-tests + if [ "$1" = "img" ]; then + common_build dbus-1 ${DBUS1_SRC_DIR} --disable-tests + fi # 编译 libatk meson_build libatk ${LIBATK_SRC_DIR} # 编译 libatk-core ( 依赖: libxml )