From 102151d3216dfe7b7ad8a0664f1b4e48535e7832 Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 18:05:40 +0800 Subject: [PATCH 1/3] add BR2_PACKAGE_ROOTFS_CHOWN to resolve home directory permission ownership issues Signed-off-by: lindongping --- configs/phytiumpi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 07fa72c8..797e8cd2 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 -- Gitee From c0f7d454c4a3d11d1c44f192ad87f396f6df5817 Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 18:06:41 +0800 Subject: [PATCH 2/3] set locale variables to resolve perl warning Signed-off-by: lindongping --- board/phytium/common/debian-package-installer | 10 +++++++--- board/phytium/common/post-custom-skeleton-debian-11.sh | 5 ++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index 333151c0..095209c8 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 9b6df10c..7ce38240 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" -- Gitee From 2a851bd1b3d6160ce0b74c504b8d6e2b54e2e7a6 Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 18:07:15 +0800 Subject: [PATCH 3/3] reduce the xz compression level to resolve compression failure Signed-off-by: lindongping --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae..ddbb4a74 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 -- Gitee