deepin: fix aarch64 rootfs; fix github actions build error

termux · Nov 28, 2023 · 0ee59e9 · 0ee59e9
1 parent 60e9f0d
commit 0ee59e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/distro-build/deepin.sh b/distro-build/deepin.sh
@@ -19,17 +19,26 @@ bootstrap_distribution() {
 		aptsources=Debian\n\
 		bootstrap=Deepin\n\
 		[Deepin]\n\
-		packages=apt ca-certificates passwd locales-all\n\
+		packages=apt base-files ca-certificates passwd locales-all\n\
 		source=https://community-packages.deepin.com/${dist_version}/\n\
 		suite=${dist_version}\n\
 		" >/tmp/${dist_version}.multistrap
 		sudo multistrap -f /tmp/${dist_version}.multistrap
 
+		cat <<- EOF | sudo unshare -mpf bash -e -
 		rm -f "${WORKDIR}"/deepin-$(translate_arch "$arch")/etc/resolv.conf
 		echo "nameserver 1.1.1.1" > "${WORKDIR}"/deepin-$(translate_arch "$arch")/etc/resolv.conf
 		echo "en_US.UTF-8 UTF-8" > "${WORKDIR}"/deepin-$(translate_arch "$arch")/etc/locale.gen
 		echo "deb     https://community-packages.deepin.com/${dist_version}/ ${dist_version} main commercial community" > ${WORKDIR}/deepin-$(translate_arch "$arch")/etc/apt/sources.list
 		echo "deb-src https://community-packages.deepin.com/${dist_version}/ ${dist_version} main commercial community" >> ${WORKDIR}/deepin-$(translate_arch "$arch")/etc/apt/sources.list
+		mount --bind "${WORKDIR}/deepin-$(translate_arch "$arch")/" "${WORKDIR}/deepin-$(translate_arch "$arch")/"
+		mount --bind /dev "${WORKDIR}/deepin-$(translate_arch "$arch")/dev"
+		mount --bind /proc "${WORKDIR}/deepin-$(translate_arch "$arch")/proc"
+		mount --bind /sys "${WORKDIR}/deepin-$(translate_arch "$arch")/sys"
+		# configure packages in 2 runs to avoid dependency issues related to base-files and bash.
+		env DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot "${WORKDIR}/deepin-$(translate_arch "$arch")" dpkg --configure -a || true
+		env DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot "${WORKDIR}/deepin-$(translate_arch "$arch")" dpkg --configure -a
+		EOF
 
 		sudo tar -J -c \
 			-f "${ROOTFS_DIR}/deepin-$(translate_arch "$arch")-pd-${CURRENT_VERSION}.tar.xz" \

diff --git a/distro-plugins/deepin.sh b/distro-plugins/deepin.sh
@@ -4,7 +4,7 @@
 DISTRO_NAME="deepin"
 DISTRO_COMMENT="Supports only 64-bit CPUs."
 
-TARBALL_URL['aarch64']="https://github.com/termux/proot-distro/releases/download/v4.3.1/deepin-aarch64-pd-v4.3.1.tar.xz"
-TARBALL_SHA256['aarch64']="58f9538b5b3f70d845cfe7f8e708b5f79e536612c0f00d39c68ccedd23ef2d76"
-TARBALL_URL['x86_64']="https://github.com/termux/proot-distro/releases/download/v4.3.1/deepin-x86_64-pd-v4.3.1.tar.xz"
-TARBALL_SHA256['x86_64']="ce7dc056811483eea352d6ad61bf39296c2eb7281bbb40f76ae0a27300a51f4c"
+TARBALL_URL['aarch64']="https://github.com/termux/proot-distro/releases/download/v4.3.1/deepin-aarch64-pd-v4.3.1-2.tar.xz"
+TARBALL_SHA256['aarch64']="00136de01343b61e2d8ab47b5439842ff2c32380a657a0892c2a2475d9d01e84"
+TARBALL_URL['x86_64']="https://github.com/termux/proot-distro/releases/download/v4.3.1/deepin-x86_64-pd-v4.3.1-2.tar.xz"
+TARBALL_SHA256['x86_64']="3b5c398a59b92a53c123e6b7265d2f43278bdbf46e4bf384da541511ec04ad7b"