diff --git a/.github/workflows/build-rootfs.yml b/.github/workflows/build-rootfs.yml index ef7e071..124c838 100644 --- a/.github/workflows/build-rootfs.yml +++ b/.github/workflows/build-rootfs.yml @@ -65,8 +65,10 @@ jobs: prerelease: true title: "v${{ env.VERSION }}" files: | - rootfs/deepin-rootfs-amd64.tar.gz - rootfs/deepin-rootfs-arm64.tar.gz - rootfs/deepin-rootfs-riscv64.tar.gz - rootfs/deepin-rootfs-loong64.tar.gz - rootfs/deepin-rootfs-i386.tar.gz + rootfs/deepin-wsl-rootfs-amd64.tar.gz + rootfs/deepin-wsl-rootfs-arm64.tar.gz + rootfs/deepin-docker-rootfs-amd64.tar.gz + rootfs/deepin-docker-rootfs-arm64.tar.gz + rootfs/deepin-docker-rootfs-riscv64.tar.gz + rootfs/deepin-docker-rootfs-loong64.tar.gz + rootfs/deepin-docker-rootfs-i386.tar.gz diff --git a/build.sh b/build.sh index c628c33..89f00cb 100755 --- a/build.sh +++ b/build.sh @@ -10,9 +10,7 @@ ROOTFS=`mktemp -d` dist_version="beige" dist_name="deepin" SOURCES_FILE=config/apt/sources.list -PACKAGES_FILE=config/packages.list/packages.list readarray -t REPOS < $SOURCES_FILE -PACKAGES=`cat $PACKAGES_FILE | grep -v "^-" | xargs | sed -e 's/ /,/g'` OUT_DIR=rootfs mkdir -p $OUT_DIR @@ -21,7 +19,7 @@ sudo apt update -y && sudo apt install -y curl git mmdebstrap qemu-user-static u # 开启异架构支持 sudo systemctl start systemd-binfmt -for arch in amd64 arm64 riscv64 loong64 i386; do +function build_rootfs() { sudo mmdebstrap \ --hook-dir=/usr/share/mmdebstrap/hooks/merged-usr \ --include=$PACKAGES \ @@ -32,11 +30,33 @@ for arch in amd64 arm64 riscv64 loong64 i386; do $dist_version \ $ROOTFS \ "${REPOS[@]}" + + # 判断是否构建 wsl 的根文件系统,体内钾 wsl.conf 默认开启systemd + if [[ $TARGET=="wsl" ]]; + then + sudo tee $ROOTFS/etc/wsl.conf <