From 7a6353641239b60652d27e8e912ca30f3dae0121 Mon Sep 17 00:00:00 2001 From: lindongping Date: Fri, 28 Mar 2025 16:50:03 +0800 Subject: [PATCH 1/6] gstreamer: install libgstximagesink.so from gstreamer version 1.22.12 Signed-off-by: weishanshan1084 Signed-off-by: lindongping --- board/phytium/common/debian-additional_packages_list | 2 +- configs/phytiumpi_defconfig | 5 +++++ configs/phytiumpi_desktop_defconfig | 5 +++++ package/gstreamer1/gst1-plugins-base/Config.in | 3 --- .../gst1-plugins-base/gst1-plugins-base.hash | 2 ++ .../gst1-plugins-base/gst1-plugins-base.mk | 11 ++++++++++- package/gstreamer1/gstreamer1/Config.in | 1 - package/gstreamer1/gstreamer1/gstreamer1.hash | 2 ++ package/gstreamer1/gstreamer1/gstreamer1.mk | 12 ++++++++++-- support/misc/cross-compilation.conf.in | 2 +- 10 files changed, 36 insertions(+), 9 deletions(-) diff --git a/board/phytium/common/debian-additional_packages_list b/board/phytium/common/debian-additional_packages_list index 9a4eccb6..0519473c 100644 --- a/board/phytium/common/debian-additional_packages_list +++ b/board/phytium/common/debian-additional_packages_list @@ -10,5 +10,5 @@ v4l-utils python3-gpiozero avahi-daemon lua5.1 luajit hardlink curl fake-hwclock dphys-swapfile apt-listchanges usb-modeswitch libmtp-runtime rsync htop man-db rng-tools \ ssh-import-id ethtool ntfs-3g pciutils udisks2 zip p7zip-full file \ cifs-utils mkvtoolnix wpasupplicant wireless-tools net-tools \ -vim locales network-manager jq git" +vim locales network-manager jq git libglib2.0-dev libxext-dev libxv-dev" diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 06eff676..de0986d7 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -74,3 +74,8 @@ BR2_PACKAGE_PHYTIUM_OTA=y # util-linux BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y + +# install libgstximagesink.so from gstreamer +BR2_PACKAGE_XORG7=y +BR2_PACKAGE_GSTREAMER1=y +BR2_PACKAGE_GST1_PLUGINS_BASE=y diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig index 9e34d7fc..83bc350e 100644 --- a/configs/phytiumpi_desktop_defconfig +++ b/configs/phytiumpi_desktop_defconfig @@ -76,3 +76,8 @@ BR2_PACKAGE_BUSYBOX=n # util-linux BR2_PACKAGE_UTIL_LINUX=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y + +# install libgstximagesink.so from gstreamer +BR2_PACKAGE_XORG7=y +BR2_PACKAGE_GSTREAMER1=y +BR2_PACKAGE_GST1_PLUGINS_BASE=y diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index df10774a..ba84a7fa 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -1,8 +1,5 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE bool "gst1-plugins-base" - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 help A basic set of well-supported plug-ins for GStreamer. diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 060a871b..e0b04da9 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,5 @@ # From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.12.tar.xz.sha256sum +sha256 73cfadc3a6ffe77ed974cfd6fb391c605e4531f48db21dd6b9f42b8cb69bd8c1 gst-plugins-base-1.22.12.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 512e3fde..005f22ad 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.9 +GST1_PLUGINS_BASE_VERSION = 1.22.12 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES @@ -231,7 +231,9 @@ GST1_PLUGINS_BASE_DEPENDENCIES += zlib endif ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv +endif GST1_PLUGINS_BASE_CONF_OPTS += \ -Dx11=enabled \ -Dxshm=enabled \ @@ -292,4 +294,11 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvorbis=disabled endif +# Only reinstall libgstximagesink.so for custom skeleton +ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) +define GST1_PLUGINS_BASE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/build/sys/ximage/libgstximagesink.so $(TARGET_DIR)/usr/lib/aarch64-linux-gnu/gstreamer-1.0/ +endef +endif + $(eval $(meson-package)) diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in index 5609d869..8d56dc7c 100644 --- a/package/gstreamer1/gstreamer1/Config.in +++ b/package/gstreamer1/gstreamer1/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_GSTREAMER1 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 help GStreamer is an open source multimedia framework. This 1.x version of Gstreamer is incompatible with Gstreamer 0.10.x. diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index b6ed001e..39146135 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,5 @@ # From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.12.tar.xz.sha256sum +sha256 ac352f3d02caa67f3b169daa9aa78b04dea0fc08a727de73cb28d89bd54c6f61 gstreamer-1.22.12.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 5b9125e6..ebc807a7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.9 +GSTREAMER1_VERSION = 1.22.12 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES @@ -12,6 +12,9 @@ GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.1+ GSTREAMER1_CPE_ID_VENDOR = gstreamer_project GSTREAMER1_CPE_ID_PRODUCT = gstreamer +ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) +GSTREAMER1_INSTALL_TARGET = NO +endif GSTREAMER1_CONF_OPTS = \ -Dexamples=disabled \ @@ -34,11 +37,16 @@ GSTREAMER1_DEPENDENCIES = \ host-bison \ host-flex \ host-pkgconf \ - libglib2 \ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ $(if $(BR2_PACKAGE_VALGRIND),valgrind) \ $(TARGET_NLS_DEPENDENCIES) +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) +GSTREAMER1_DEPENDENCIES += libglib2 +else +GSTREAMER1_DEPENDENCIES += host-libglib2 +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GSTREAMER1_CONF_OPTS += -Dintrospection=enabled GSTREAMER1_DEPENDENCIES += gobject-introspection diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index a58ab553..20519ce7 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -27,7 +27,7 @@ cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig:@STAGING_DIR@/usr/lib/aarch64-linux-gnu/pkgconfig' pkg_config_static = '@STATIC@' # enable meson build to pass a toolchain file to cmake cmake_toolchain_file = '@HOST_DIR@/share/buildroot/toolchainfile.cmake' -- Gitee From 713ef1ed7468d1013e2dc671b1717667aa1f6046 Mon Sep 17 00:00:00 2001 From: lindongping Date: Fri, 28 Mar 2025 16:51:21 +0800 Subject: [PATCH 2/6] add ffmpeg and dkms for vpu Signed-off-by: lindongping --- board/phytium/common/debian-additional_packages_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/phytium/common/debian-additional_packages_list b/board/phytium/common/debian-additional_packages_list index 0519473c..27e1f5bd 100644 --- a/board/phytium/common/debian-additional_packages_list +++ b/board/phytium/common/debian-additional_packages_list @@ -10,5 +10,5 @@ v4l-utils python3-gpiozero avahi-daemon lua5.1 luajit hardlink curl fake-hwclock dphys-swapfile apt-listchanges usb-modeswitch libmtp-runtime rsync htop man-db rng-tools \ ssh-import-id ethtool ntfs-3g pciutils udisks2 zip p7zip-full file \ cifs-utils mkvtoolnix wpasupplicant wireless-tools net-tools \ -vim locales network-manager jq git libglib2.0-dev libxext-dev libxv-dev" +vim locales network-manager jq git libglib2.0-dev libxext-dev libxv-dev ffmpeg dkms" -- Gitee From 02a38ebc76157a9efb6665536e48704295ec973e Mon Sep 17 00:00:00 2001 From: lindongping Date: Mon, 31 Mar 2025 16:38:31 +0800 Subject: [PATCH 3/6] debian-package-installer: remove plymouth Signed-off-by: lindongping --- board/phytium/common/debian-package-installer | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index 67e71864..e4a70dfe 100755 --- a/board/phytium/common/debian-package-installer +++ b/board/phytium/common/debian-package-installer @@ -64,6 +64,8 @@ do_distrorfs_second_stage() { echo Installing $pkg ... DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $pkg || exit 1 done + # remove plymouth + DEBIAN_FRONTEND=noninteractive apt -y remove plymouth || true echo 'root' >> /etc/deniedusers chmod 600 /etc/deniedusers echo 'auth required pam_listfile.so onerr=succeed item=user sense=deny file=/etc/deniedusers' >> /etc/pam.d/lightdm -- Gitee From a31683ac1651041bb04e501e74231a06569993d4 Mon Sep 17 00:00:00 2001 From: lindongping Date: Mon, 31 Mar 2025 16:47:37 +0800 Subject: [PATCH 4/6] disable automatic switching of audio output devices Signed-off-by: lindongping --- board/phytium/common/debian-package-installer | 1 - board/phytium/common/post-build.sh | 6 ---- .../phytium-desktop-tools.mk | 6 ---- .../src/Phytium/PMDK-I2S/HiFi.conf | 16 ---------- .../src/Phytium/PMDK-I2S/PMDK-I2S.conf | 6 ---- .../src/Phytium/es8336/HiFi.conf | 31 ------------------- .../src/Phytium/es8336/es8336.conf | 6 ---- .../src/sound_output_device_switching.desktop | 8 ----- .../src/switch_to_headphone.sh | 19 ------------ 9 files changed, 99 deletions(-) delete mode 100644 package/phytium-desktop-tools/src/Phytium/PMDK-I2S/HiFi.conf delete mode 100644 package/phytium-desktop-tools/src/Phytium/PMDK-I2S/PMDK-I2S.conf delete mode 100644 package/phytium-desktop-tools/src/Phytium/es8336/HiFi.conf delete mode 100644 package/phytium-desktop-tools/src/Phytium/es8336/es8336.conf delete mode 100644 package/phytium-desktop-tools/src/sound_output_device_switching.desktop delete mode 100755 package/phytium-desktop-tools/src/switch_to_headphone.sh diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index e4a70dfe..eda6f5b6 100755 --- a/board/phytium/common/debian-package-installer +++ b/board/phytium/common/debian-package-installer @@ -74,7 +74,6 @@ do_distrorfs_second_stage() { echo 'update-sink-proplist 1 device.description=Headphone' >> /etc/pulse/default.pa echo 'update-sink-proplist 0 device.description=HDMI' >> /etc/pulse/default.pa echo 'set-default-sink 1' >> /etc/pulse/default.pa - echo 'load-module module-switch-on-connect' >> /etc/pulse/default.pa # touch .desktop_firstrun touch /root/.desktop_firstlogin diff --git a/board/phytium/common/post-build.sh b/board/phytium/common/post-build.sh index 6b6db45b..303de45f 100755 --- a/board/phytium/common/post-build.sh +++ b/board/phytium/common/post-build.sh @@ -10,12 +10,6 @@ main() ln -sf /lib/systemd/system/phytium-tee-supplicant.service $1/etc/systemd/system/sysinit.target.wants/phytium-tee-supplicant.service fi - # alsa UCM - if grep -Eq "^BR2_PACKAGE_PHYTIUM_DESKTOP_TOOLS=y$" ${BR2_CONFIG}; then - ln -sf ../../Phytium/es8336/es8336.conf $1/usr/share/alsa/ucm2/conf.d/simple-card/phytium,pe220x-i2s-audio.conf - ln -sf ../../Phytium/PMDK-I2S/PMDK-I2S.conf $1/usr/share/alsa/ucm2/conf.d/PMDK-I2S/PMDK-I2S.conf - fi - # zram if grep -Eq "^BR2_PACKAGE_PHYTIUM_ZRAM=y$" ${BR2_CONFIG}; then sudo chroot ${1} systemctl enable phytium-zram-config.service diff --git a/package/phytium-desktop-tools/phytium-desktop-tools.mk b/package/phytium-desktop-tools/phytium-desktop-tools.mk index 20d994e1..fb2cccad 100644 --- a/package/phytium-desktop-tools/phytium-desktop-tools.mk +++ b/package/phytium-desktop-tools/phytium-desktop-tools.mk @@ -15,18 +15,12 @@ define PHYTIUM_DESKTOP_TOOLS_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/lightdm/lightdm-gtk-greeter.conf.d/ mkdir -p $(TARGET_DIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/ mkdir -p $(TARGET_DIR)/var/lib/alsa/ - mkdir -p $(TARGET_DIR)/usr/share/alsa/ucm2/ - mkdir -p $(TARGET_DIR)/usr/share/alsa/ucm2/conf.d/simple-card/ - mkdir -p $(TARGET_DIR)/usr/share/alsa/ucm2/conf.d/PMDK-I2S/ mkdir -p $(TARGET_DIR)/usr/local/bin/ mkdir -p $(TARGET_DIR)/etc/udev/rules.d/ $(INSTALL) -m 777 -D $(@D)/dark.jpg $(TARGET_DIR)/usr/share/images/desktop-base/ $(INSTALL) -m 755 -D $(@D)/01_debian.conf $(TARGET_DIR)/usr/share/lightdm/lightdm-gtk-greeter.conf.d/ $(INSTALL) -m 755 -D $(@D)/xfce4-desktop.xml $(TARGET_DIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/ $(INSTALL) -m 644 -D $(@D)/asound.state $(TARGET_DIR)/var/lib/alsa/ - cp -rf $(@D)/Phytium/ $(TARGET_DIR)/usr/share/alsa/ucm2/ - $(INSTALL) -m 755 -D $(@D)/switch_to_headphone.sh $(TARGET_DIR)/usr/bin/ - $(INSTALL) -m 644 -D $(@D)/sound_output_device_switching.desktop $(TARGET_DIR)/usr/share/alsa/ucm2/ $(INSTALL) -m 755 -D $(@D)/auto_resolution.sh $(TARGET_DIR)/usr/local/bin/ $(INSTALL) -m 644 -D $(@D)/99-monitor-hotplug.rules $(TARGET_DIR)/etc/udev/rules.d/ endef diff --git a/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/HiFi.conf b/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/HiFi.conf deleted file mode 100644 index 1845c10c..00000000 --- a/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/HiFi.conf +++ /dev/null @@ -1,16 +0,0 @@ -SectionDevice."HDMI Audio" { - Comment "HDMI Audio" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},0" - JackControl "HDMI/DP,pcm=0 Jack" - } -} - diff --git a/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/PMDK-I2S.conf b/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/PMDK-I2S.conf deleted file mode 100644 index 14a3a45e..00000000 --- a/package/phytium-desktop-tools/src/Phytium/PMDK-I2S/PMDK-I2S.conf +++ /dev/null @@ -1,6 +0,0 @@ -Syntax 3 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality voice." -} diff --git a/package/phytium-desktop-tools/src/Phytium/es8336/HiFi.conf b/package/phytium-desktop-tools/src/Phytium/es8336/HiFi.conf deleted file mode 100644 index e5295f0c..00000000 --- a/package/phytium-desktop-tools/src/Phytium/es8336/HiFi.conf +++ /dev/null @@ -1,31 +0,0 @@ -SectionDevice."Headphones" { - Comment "Headphones" - - EnableSequence [ - ] - - DisableSequence [ - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},0" - JackControl "Headphones Jack" - } -} - -SectionDevice."Microphone" { - Comment "Microphone" - - EnableSequence [ - cset "name='Differential Mux' lin2-rin2" - ] - - DisableSequence [ - ] - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},0" - } -} diff --git a/package/phytium-desktop-tools/src/Phytium/es8336/es8336.conf b/package/phytium-desktop-tools/src/Phytium/es8336/es8336.conf deleted file mode 100644 index 14a3a45e..00000000 --- a/package/phytium-desktop-tools/src/Phytium/es8336/es8336.conf +++ /dev/null @@ -1,6 +0,0 @@ -Syntax 3 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality voice." -} diff --git a/package/phytium-desktop-tools/src/sound_output_device_switching.desktop b/package/phytium-desktop-tools/src/sound_output_device_switching.desktop deleted file mode 100644 index 412b500d..00000000 --- a/package/phytium-desktop-tools/src/sound_output_device_switching.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=/usr/bin/switch_to_headphone.sh -Hidden=false -NoDisplay=false -X-GNOME-Autostart-enabled=true -Name=Switch to headphone Script -Comment=Starts switch to headphone script on login diff --git a/package/phytium-desktop-tools/src/switch_to_headphone.sh b/package/phytium-desktop-tools/src/switch_to_headphone.sh deleted file mode 100755 index 6b690270..00000000 --- a/package/phytium-desktop-tools/src/switch_to_headphone.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Phytium phytiumpi script for automatically switching the sound output device. -# -# Copyright (c) 2024 Phytium Technology Co., Ltd. - - -while true; do - - FLAG="$(pactl list sinks | grep -oP '\[Out\] Headphones:.*?\bnot available\b' | grep -o 'not available')" - if pgrep -x pulseaudio > /dev/null - then - if [ -z "$FLAG" ]; then - pacmd set-default-sink 1 - fi - fi - sleep 2 - -done -- Gitee From 1b6daf3ccede2ca07c3242cddb92a97b3e6818a3 Mon Sep 17 00:00:00 2001 From: lindongping Date: Mon, 31 Mar 2025 16:54:23 +0800 Subject: [PATCH 5/6] update README Signed-off-by: lindongping --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7c1e2941..4fad48c5 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,11 @@ Buildroot被设计为在x86 Linux系统上运行，结合其他因素，本仓 `$ sudo apt install debootstrap qemu-user-static binfmt-support debian-archive-keyring` 对于debian12系统，需要设置PATH环境变量：`PATH=$PATH:/usr/sbin` -## 下载Phytium Pi OS -`$ git clone https://gitee.com/phytium_embedded/phytium-pi-os` +## 下载Phytium Pi OS并切换到2024.02分支 +``` +$ git clone https://gitee.com/phytium_embedded/phytium-pi-os +$ git checkout -b 2024.02 origin/2024.02 +``` 克隆后，将会生成phytium-pi-os目录，我们称之为源码根目录，若无另外说明，下面的操作命令都是基于该源码根目录进行描述的 # 查看支持的defconfig 为飞腾派构建的文件系统的配置文件位于configs目录。 @@ -304,4 +307,4 @@ $ make ``` # FAQ -1、关于phytium pi vpu的包请咨询飞腾技术支持或FAE。 +1、关于phytium pi vpu的包请咨询linan1284@phytium.com.cn。 -- Gitee From e8f1cef021dde7f889536409ce7de8cf2f8bff47 Mon Sep 17 00:00:00 2001 From: lindongping Date: Mon, 31 Mar 2025 17:18:09 +0800 Subject: [PATCH 6/6] update linux kernel, xenomai, ethercat, jailhouse to v3.1 Signed-off-by: lindongping --- configs/phytiumpi_defconfig | 2 +- configs/phytiumpi_desktop_defconfig | 2 +- configs/phytiumpi_linux_6.6_rt.config | 2 +- configs/phytiumpi_xenomai_cobalt_6.6.config | 2 +- configs/phytiumpi_xenomai_mercury_6.6.config | 2 +- package/igh-ethercat/igh-ethercat.mk | 2 +- package/jailhouse/jailhouse.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index de0986d7..27c42006 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -34,7 +34,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 6.6 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4850d0096546d55b0bf9014e572598fd62523f5b" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.1" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig index 83bc350e..964efeaf 100644 --- a/configs/phytiumpi_desktop_defconfig +++ b/configs/phytiumpi_desktop_defconfig @@ -34,7 +34,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 6.6 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4850d0096546d55b0bf9014e572598fd62523f5b" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.1" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_linux_6.6_rt.config b/configs/phytiumpi_linux_6.6_rt.config index 13ad9a03..3e20455f 100644 --- a/configs/phytiumpi_linux_6.6_rt.config +++ b/configs/phytiumpi_linux_6.6_rt.config @@ -1,2 +1,2 @@ # kernel 6.6-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="20635251686c50c94eeea2e8a71a99fb59ee80df" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.1" diff --git a/configs/phytiumpi_xenomai_cobalt_6.6.config b/configs/phytiumpi_xenomai_cobalt_6.6.config index d070ac09..a1ac2af3 100644 --- a/configs/phytiumpi_xenomai_cobalt_6.6.config +++ b/configs/phytiumpi_xenomai_cobalt_6.6.config @@ -1,6 +1,6 @@ # cobalt kernel 6.6.y-dovetail BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/linux-kernel-xenomai.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c096fe6eee82d7c2035b8ae03567eead94f63149" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6.63-dovetail2_v3.1" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/cobalt.config" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y diff --git a/configs/phytiumpi_xenomai_mercury_6.6.config b/configs/phytiumpi_xenomai_mercury_6.6.config index 7458595d..d9f3e957 100644 --- a/configs/phytiumpi_xenomai_mercury_6.6.config +++ b/configs/phytiumpi_xenomai_mercury_6.6.config @@ -1,5 +1,5 @@ # kernel 6.6-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="20635251686c50c94eeea2e8a71a99fb59ee80df" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.1" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 07052b26..6a163431 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = dbbd80fa4bf93d2cc3a9ffc6623f678b1092a1fa +IGH_ETHERCAT_VERSION = stable-1.6_v3.1 IGH_ETHERCAT_SITE = https://gitee.com/phytium_embedded/ether-cat.git IGH_ETHERCAT_SITE_METHOD = git IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 1793438a..a509a8b9 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -JAILHOUSE_VERSION = 1581a8ceaaa1f0a4ec6ea95b6dca3ba5f4e62ba5 +JAILHOUSE_VERSION = jailhouse_v2.2 JAILHOUSE_SITE = https://gitee.com/phytium_embedded/phytium-jailhouse.git JAILHOUSE_SITE_METHOD = git JAILHOUSE_LICENSE = GPL-2.0 -- Gitee