diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index 333151c051fcee897884f479a75fe3f12be4881a..095209c8050c5fd1cc98aab9e4f08c81f6cbef9b 100755 --- a/board/phytium/common/debian-package-installer +++ b/board/phytium/common/debian-package-installer @@ -33,9 +33,6 @@ do_distrorfs_second_stage() { # set default hostname echo localhost > /etc/hostname - echo "Asia/Shanghai" > /etc/timezone - rm /etc/localtime - dpkg-reconfigure -f noninteractive tzdata # set apt sources list to install additional packages asl=/etc/apt/sources.list @@ -55,6 +52,8 @@ do_distrorfs_second_stage() { apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade || exit 1 echo upgraded + export LC_ALL=C LANGUAGE=C LANG=C + echo installing base packages: $pkglist for pkg in $additional_base_packages_list; do echo Installing $pkg ... @@ -87,6 +86,11 @@ do_distrorfs_second_stage() { echo remove packages. DEBIAN_FRONTEND=noninteractive apt-get -y remove --purge parole || exit 1 fi + + # set timezone + echo "Asia/Shanghai" > /etc/timezone + rm /etc/localtime + dpkg-reconfigure -f noninteractive tzdata if [ $5 = 'phytiumpi' ]; then echo 'defaults.pcm.!card phytiumpe220xi2' >> /etc/asound.conf diff --git a/board/phytium/common/post-custom-skeleton-debian-11.sh b/board/phytium/common/post-custom-skeleton-debian-11.sh index 9b6df10c953dfe60a4e84af760459d6f78bfe59b..7ce3824061722b68c8259eb932472ff159e9c42b 100755 --- a/board/phytium/common/post-custom-skeleton-debian-11.sh +++ b/board/phytium/common/post-custom-skeleton-debian-11.sh @@ -72,13 +72,12 @@ do_distrorfs_first_stage() { if [ ! -d $RFSDIR/debootstrap ]; then echo "testdeboot" - export LANG=zh_CN.UTF-8 + export LANG=en_US.UTF-8 sudo debootstrap --keyring=board/phytium/common/debian-archive-bullseye-stable.gpg --arch=$1 --foreign bullseye $RFSDIR https://mirrors.tuna.tsinghua.edu.cn/debian/ [ $1 != amd64 -a ! -f $RFSDIR/usr/bin/qemu-${tgtarch}-static ] && sudo cp $(which qemu-${tgtarch}-static) $RFSDIR/usr/bin echo "installing for second-stage ..." - export LC_ALL="zh_CN.UTF-8" && export LANGUAGE="zh_CN:zh" && export LANG="zh_CN.UTF-8" - #DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=zh_CN.UTF-8 LANGUAGE=zh_CN:zh LANG=zh_CN.UTF-8 \ + DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C \ sudo chroot $RFSDIR /debootstrap/debootstrap --variant=minbase --second-stage if [ "x$?" != "x0" ]; then do_recover_from_error "debootstrap failed in second-stage" diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 07fa72c833c180679f711fe0545157866ee67fd0..797e8cd2831a757fd4a10e2da2b3e8b7b548a176 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -57,8 +57,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # required tools to create the microSD image BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_ROOTFS_CHOWN=y + BR2_PACKAGE_BUSYBOX=n -BR2_PACKAGE_PHYUBOOT=y # FFmpeg BR2_PACKAGE_FFMPEG=y diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b7c71f657075e87359c1647e172c569..ddbb4a748cd1bddb1cc40ca1b0d9b950bf2b0517 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -149,7 +149,7 @@ endif ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y) ROOTFS_$(2)_DEPENDENCIES += host-xz ROOTFS_$(2)_COMPRESS_EXT = .xz -ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c +ROOTFS_$(2)_COMPRESS_CMD = xz -6 -C crc32 -c ifeq ($(BR2_REPRODUCIBLE),) ROOTFS_$(2)_COMPRESS_CMD += -T $(PARALLEL_JOBS) endif