diff --git a/phytium-ota/fitImage/6.6/fitImage.tar b/phytium-ota/fitImage/6.6/fitImage.tar index d77c9f0dd7335567329e1beef844c45b470cbb30..5160948ba009219957d000265fc93efd1ab6ee08 100644 Binary files a/phytium-ota/fitImage/6.6/fitImage.tar and b/phytium-ota/fitImage/6.6/fitImage.tar differ diff --git a/phytium-ota/rootfs/debian11/rootfs.tar b/phytium-ota/rootfs/debian11/rootfs.tar index ddb9fb5dd9695e251ee8a90eec7b11ba719b7e4d..bb2ede369a925ed8eefc9488b02615681be8f02e 100644 Binary files a/phytium-ota/rootfs/debian11/rootfs.tar and b/phytium-ota/rootfs/debian11/rootfs.tar differ diff --git a/phytium-ota/rootfs/debian12/rootfs.tar b/phytium-ota/rootfs/debian12/rootfs.tar index a4581884b889bd66831553db00d314ae676f9b91..2a1e1586c688a35994e29ecf34149059e78ccfd6 100644 Binary files a/phytium-ota/rootfs/debian12/rootfs.tar and b/phytium-ota/rootfs/debian12/rootfs.tar differ diff --git a/phytium-ota/scripts/rootfs_ota b/phytium-ota/scripts/rootfs_ota index bfed52282461425ed72b708082b1b7ea25dd5892..649bb1525427df2d4f30601e8d39571085798d36 100755 --- a/phytium-ota/scripts/rootfs_ota +++ b/phytium-ota/scripts/rootfs_ota @@ -9,8 +9,12 @@ install_and_remove_packages() { - apt install -y locales audacity jq network-manager libglib2.0-dev libxext-dev libxv-dev ffmpeg + apt update + apt install -y locales audacity jq network-manager libglib2.0-dev libxext-dev libxv-dev ffmpeg dkms apt remove -y dhcpcd5 arctica-greeter plymouth + # remove the linux-headers installed when installing dkms + dpkg -l | grep linux-headers | cut -d ' ' -f3 | xargs dpkg --purge + dpkg -l | grep linux-kbuild | cut -d ' ' -f3 | xargs dpkg --purge } # install_and_remove_package # $1: debian11 or debian12 @@ -22,19 +26,19 @@ rootfs_configure() { sed -i 's/^default-sink = alsa_output.platform-sound.stereo-fallback/#&/' "/etc/pulse/client.conf" # set kernel loglevel sed -i 's/^#kernel.printk = 3 4 1 3/kernel.printk = 4 4 1 7/' "/etc/sysctl.d/99-sysctl.conf" - # set the name of the sound output devices + # set the name and default sink of the sound output devices if ! grep -q '^update-sink-proplist 0 device.description=HDMI' "/etc/pulse/default.pa"; then echo 'update-sink-proplist 0 device.description=HDMI' >> "/etc/pulse/default.pa" fi - if [[ "$1" == "debian12" ]]; then - Phytiumpios_version="V2.1" - if ! grep -q '^update-sink-proplist 1 device.description=Headphone' "/etc/pulse/default.pa"; then - echo 'update-sink-proplist 1 device.description=Headphone' >> "/etc/pulse/default.pa" - fi - if ! grep -q '^set-default-sink 1' "/etc/pulse/default.pa"; then + if ! grep -q '^update-sink-proplist 1 device.description=Headphone' "/etc/pulse/default.pa"; then + echo 'update-sink-proplist 1 device.description=Headphone' >> "/etc/pulse/default.pa" + fi + if ! grep -q '^set-default-sink 1' "/etc/pulse/default.pa"; then echo 'set-default-sink 1' >> "/etc/pulse/default.pa" - fi - sed -i 's/^load-module module-switch-on-connect/#&/' "/etc/pulse/default.pa" + fi + + if [[ "$1" == "debian12" ]]; then + Phytiumpios_version="V2.2" # alsa UCM rm -rf /usr/share/alsa/ucm2/conf.d/PMDK-I2S/ rm -rf /usr/share/alsa/ucm2/conf.d/simple-card/ @@ -45,18 +49,15 @@ rootfs_configure() { sed -i '/^NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}"/s/^/#/' /lib/udev/rules.d/80-net-setup-link.rules # set default greeter to lightdm-gtk-greeter sed -i "s/^greeter-session=arctica-greeter/greeter-session=lightdm-gtk-greeter/" /etc/lightdm/lightdm.conf + # add packages for gstreamer + for pkg in libgstreamer1.0-0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl gstreamer1.0-gtk3 gstreamer1.0-pulseaudio gstreamer1.0-tools; do + DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $pkg || exit 1 + done + elif [[ "$1" == "debian11" ]]; then Phytiumpios_version="V1.7" # rootfs-chown systemctl enable systemd-rootfs-chown.service - # set the name of the sound output devices - sed -i 's/^update-sink-proplist 1 device.description=Headphone/#&/' "/etc/pulse/default.pa" - sed -i 's/^set-default-sink 1/#&/' "/etc/pulse/default.pa" - if ! grep -q '^^load-module module-switch-on-connect' "/etc/pulse/default.pa"; then - echo '^load-module module-switch-on-connect' >> "/etc/pulse/default.pa" - fi - # phytium-vpu - systemctl enable phytium-vpu.service # set default greeter to lightdm-gtk-greeter sed -i "s/^greeter-session=ukui-greeter/greeter-session=lightdm-gtk-greeter/" /etc/lightdm/lightdm.conf fi diff --git a/phytium-ota/scripts/run_phytium_ota b/phytium-ota/scripts/run_phytium_ota index 671585593d72ffa895f2859740ecd1b368a11699..e491629e5f474c39086730c90b5f4b7b43611535 100755 --- a/phytium-ota/scripts/run_phytium_ota +++ b/phytium-ota/scripts/run_phytium_ota @@ -44,8 +44,6 @@ fi # $1: debian11 or debian12 update_rootfs() { - # apt install dkms for phytium-vpu.deb - apt install -y dkms rootfs_latest=$($dest_dir/scripts/check-latest $dest_dir/rootfs/$distro rootfs) if [ "${rootfs_latest}" = "latest" ]; then echo -e "\033[1;32mrootfs is already latest, nothing to do...\033[0m" @@ -54,7 +52,6 @@ update_rootfs() { echo -e "\033[1;32mcheck hash...\033[0m" check-hash $dest_dir/rootfs/$distro/phytium-desktop-tools.deb.hash $dest_dir/rootfs/$distro/phytium-desktop-tools.deb phytium-desktop-tools.deb check-hash $dest_dir/rootfs/$distro/phytium-firstlogin.deb.hash $dest_dir/rootfs/$distro/phytium-firstlogin.deb phytium-firstlogin.deb - check-hash $dest_dir/rootfs/$distro/phytium-vpu.deb.hash $dest_dir/rootfs/$distro/phytium-vpu.deb phytium-vpu.deb check-hash $dest_dir/rootfs/$distro/phytium-zram.deb.hash $dest_dir/rootfs/$distro/phytium-zram.deb phytium-zram.deb check-hash $dest_dir/rootfs/$distro/phytium-tools.deb.hash $dest_dir/rootfs/$distro/phytium-tools.deb phytium-tools.deb check-hash $dest_dir/rootfs/$distro/lscpu.hash $dest_dir/rootfs/$distro/lscpu lscpu @@ -65,7 +62,6 @@ update_rootfs() { cp -f $dest_dir/rootfs/$distro/lscpu /usr/bin/ dpkg -i --force-overwrite $dest_dir/rootfs/$distro/phytium-desktop-tools.deb dpkg -i $dest_dir/rootfs/$distro/phytium-firstlogin.deb - dpkg -i $dest_dir/rootfs/$distro/phytium-vpu.deb dpkg -i $dest_dir/rootfs/$distro/phytium-zram.deb dpkg -i $dest_dir/rootfs/$distro/phytium-tools.deb if [[ $distro == "debian11" ]]; then @@ -116,8 +112,8 @@ update_system() { if [ "$1" == "all" ]; then update_uboot - update_kernel update_rootfs $distro + update_kernel elif [ "$1" == "uboot" ]; then update_uboot #the default uboot is hw v3, mem 4g and pcie usb3, so it is necessary to config firmware if the hardware is not the default.