From 6b1ac7793535be7263e6d8fb185f12d54f55632f Mon Sep 17 00:00:00 2001 From: lindongping Date: Thu, 21 Aug 2025 19:29:02 +0800 Subject: [PATCH 01/16] $(HOST_DIR) integrates the host-ncurses-related libraries, including terminfo. Signed-off-by: lindongping --- package/ncurses/ncurses.mk | 15 ++++++++++++++- package/python3/python3.mk | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 00e1c0d42..41e9af460 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -161,7 +161,20 @@ HOST_NCURSES_CONF_OPTS = \ --without-ada \ --with-default-terminfo-dir=/usr/share/terminfo \ --disable-db-install \ - --without-normal + --without-normal \ + --enable-widec \ + --enable-tic \ + --with-termlib \ + --enable-termcap + +define HOST_NCURSES_INSTALL_TINFO + $(INSTALL) -d $(HOST_DIR)/share/terminfo + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic + $(HOST_DIR)/bin/tic -xe xterm,xterm-256color,screen,screen-256color,tmux,tmux-256color,linux,vtn100,vt100,ansi,rxvt,rxvt-256color \ + -o $(HOST_DIR)/share/terminfo $(@D)/misc/terminfo.src +endef + +HOST_NCURSES_POST_INSTALL_HOOKS += HOST_NCURSES_INSTALL_TINFO $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index e315948a1..868e18988 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -36,6 +36,7 @@ HOST_PYTHON3_CONF_OPTS += \ # Make python believe we don't have 'hg', so that it doesn't try to # communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ + CFLAGS="-I$(HOST_DIR)/include/ncursesw" \ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ ac_cv_prog_HAS_HG=/bin/false -- Gitee From 71e2b528b29b7304772f63492278a627e5dcf144 Mon Sep 17 00:00:00 2001 From: lindongping Date: Mon, 25 Aug 2025 16:14:17 +0800 Subject: [PATCH 02/16] skeleton-custom: add rootfs_resize.sh Signed-off-by: lindongping --- .../common/post-custom-skeleton-debian.sh | 2 + .../common/post-custom-skeleton-ubuntu.sh | 2 + board/phytium/common/rootfs_resize.sh | 64 +++++++++++++++++++ .../common/ubuntu-additional_packages_list | 2 +- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100755 board/phytium/common/rootfs_resize.sh diff --git a/board/phytium/common/post-custom-skeleton-debian.sh b/board/phytium/common/post-custom-skeleton-debian.sh index 783e4a0d6..b86f48364 100755 --- a/board/phytium/common/post-custom-skeleton-debian.sh +++ b/board/phytium/common/post-custom-skeleton-debian.sh @@ -111,6 +111,8 @@ do_distrorfs_first_stage() { done sudo chmod u+s $RFSDIR/sbin/unix_chkpwd + sudo cp -f board/phytium/common/rootfs_resize.sh $RFSDIR/usr/sbin/ + if [ $4 = bullseye ]; then echo Debian GNU/Linux,11 | tee $RFSDIR/etc/.firststagedone 1>/dev/null elif [ $4 = bookworm ]; then diff --git a/board/phytium/common/post-custom-skeleton-ubuntu.sh b/board/phytium/common/post-custom-skeleton-ubuntu.sh index 37b498c74..4df33dad2 100755 --- a/board/phytium/common/post-custom-skeleton-ubuntu.sh +++ b/board/phytium/common/post-custom-skeleton-ubuntu.sh @@ -114,6 +114,8 @@ do_distrorfs_first_stage() { done sudo chmod u+s $RFSDIR/sbin/unix_chkpwd + sudo cp -f board/phytium/common/rootfs_resize.sh $RFSDIR/usr/sbin/ + if [ $4 = focal ]; then echo Ubuntu,20.04 | tee $RFSDIR/etc/.firststagedone 1>/dev/null elif [ $4 = jammy ]; then diff --git a/board/phytium/common/rootfs_resize.sh b/board/phytium/common/rootfs_resize.sh new file mode 100755 index 000000000..7f7efb1f6 --- /dev/null +++ b/board/phytium/common/rootfs_resize.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +# Phytium rootfs resize script +# +# Copyright (c) 2025 Phytium Technology Co., Ltd. + +echo "******WARNING: This script performs disk partition operations and may result in data loss. Make sure to back up important data before proceeding.******" +echo + +# Get root filesystem partition info +ROOT_PART="$(findmnt / -o source -n)" +ROOT_DEV="/dev/$(lsblk -no pkname "$ROOT_PART")" + +PART_NUM="$(echo "$ROOT_PART" | grep -o "[[:digit:]]*$")" + +LAST_PART_NUM=$(fdisk -l "$ROOT_DEV" | tail -n 1 | cut -f 1 -d' ' | grep -o "[[:digit:]]*$") +if [ "$LAST_PART_NUM" -ne "$PART_NUM" ]; then + whiptail --msgbox "$ROOT_PART is not the last partition. Don't know how to expand" 20 60 2 + return 0 +fi + +# Get the starting offset of the root partition +PART_START=$(fdisk -l "$ROOT_DEV" | tail -n 1 | awk '{print $2}') +[ "$PART_START" ] || exit 1 + +echo +# Show current partition details +echo "****** Current disk partition information: ******" +fdisk -l $ROOT_PART +echo +# Show the expected result +echo "****** After expansion, the partition is expected to occupy the maximum available space on the disk. ******" +echo +# Resize the partition using fdisk +read -p "Partition resizing is about to start. Continue? (y/n): " confirm +if [[ ! "$confirm" =~ ^(Y|y)$ ]]; then + echo "Operation cancelled." + exit 1 +fi +fdisk "$ROOT_DEV" < Date: Wed, 10 Sep 2025 19:07:26 +0800 Subject: [PATCH 03/16] firefox: remove firefox from the mozillateam PPA Signed-off-by: weishanshan1084 --- board/phytium/common/ubuntu-package-installer | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/board/phytium/common/ubuntu-package-installer b/board/phytium/common/ubuntu-package-installer index e9e1e0be1..25d07db50 100755 --- a/board/phytium/common/ubuntu-package-installer +++ b/board/phytium/common/ubuntu-package-installer @@ -101,20 +101,6 @@ do_distrorfs_second_stage() { DEBIAN_FRONTEND=noninteractive apt remove --purge -y cloud-init && apt autoremove -y || true fi - if [[ $2 = jammy || $2 = noble ]]; then - DEBIAN_FRONTEND=noninteractive apt -y install software-properties-common || true - DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:mozillateam/ppa || true - sed -i 's/ppa.launchpadcontent.net/launchpad.proxy.ustclug.org/g' /etc/apt/sources.list.d/mozillateam-* && \ - DEBIAN_FRONTEND=noninteractive apt -y update || true - cat <<-EOF > /etc/apt/preferences.d/mozillateamppa - Package: firefox - Pin: release o=LP-PPA-mozillateam - Pin-Priority: 1001 - EOF - echo 'Unattended-Upgrade::Package-Blacklist:: "firefox";' | tee /etc/apt/apt.conf.d/52unattended-upgrades-firefox - fi - DEBIAN_FRONTEND=noninteractive apt install -y --allow-downgrades firefox || true - usermod -a -G video,render,audio user #cups disable TLSv1.0 and TLSv1.1 -- Gitee From 390389e2fedc9a2e355d4309de3f9c47a5e0d1ed Mon Sep 17 00:00:00 2001 From: weishanshan1084 Date: Tue, 21 Oct 2025 15:38:43 +0800 Subject: [PATCH 04/16] linux: update version to run snap firefox Signed-off-by: weishanshan1084 --- configs/phytium_ubuntu_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/phytium_ubuntu_defconfig b/configs/phytium_ubuntu_defconfig index 8aab55a91..c6543dde5 100644 --- a/configs/phytium_ubuntu_defconfig +++ b/configs/phytium_ubuntu_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="kernel-6.6_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2a7ebb49038970103032ff6679cd627d848c66f3" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/pe2201-demo-ddr4 phytium/pe2202-chillipi-edu-board phytium/pe2202-demo-ddr4-local phytium/pe2202-demo-ddr4 phytium/pe2202-miniitx-board phytium/pe2202-power-board phytium/pe2204-come-board phytium/pe2204-demo-ddr4-local phytium/pe2204-demo-ddr4 phytium/pe2204-edu-board phytium/pe2204-hanwei-board phytium/pe2204-miniitx-board phytium/pe2204-vpx-board phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" -- Gitee From 9abe8717ff2eca42564dea5a9038578da6def6a9 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Tue, 21 Oct 2025 10:37:40 +0800 Subject: [PATCH 05/16] ubuntu-additional_packages_list: add cifs-utils Signed-off-by: lindongping2027 --- board/phytium/common/ubuntu-additional_packages_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/phytium/common/ubuntu-additional_packages_list b/board/phytium/common/ubuntu-additional_packages_list index 66d58dfb5..f854105bc 100644 --- a/board/phytium/common/ubuntu-additional_packages_list +++ b/board/phytium/common/ubuntu-additional_packages_list @@ -12,4 +12,4 @@ additional_base_packages_list="net-tools iputils-ping gcc g++ vim make autoconf 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 \ dkms initramfs-tools debhelper libgles-dev libexpat1-dev libglvnd-dev ffmpeg libglib2.0-dev libxext-dev libxv-dev \ -network-manager wpasupplicant wireless-tools parted locales trace-cmd bpftrace fdisk" +network-manager wpasupplicant wireless-tools parted locales trace-cmd bpftrace fdisk cifs-utils" -- Gitee From 1e149ba68ec12e4dde473562e736ad2b6039a42b Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Tue, 21 Oct 2025 15:19:56 +0800 Subject: [PATCH 06/16] phytium-tools: add devboardinfo and rootfs_resize Signed-off-by: lindongping2027 --- .../common/post-custom-skeleton-debian.sh | 2 - .../common/post-custom-skeleton-ubuntu.sh | 2 - package/Config.in | 1 + package/phytium-tools/Config.in | 2 + package/phytium-tools/phytium-tools.mk | 19 ++++ package/phytium-tools/src/devboardinfo | 86 +++++++++++++++++++ .../phytium-tools/src}/rootfs_resize.sh | 0 7 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 package/phytium-tools/Config.in create mode 100644 package/phytium-tools/phytium-tools.mk create mode 100644 package/phytium-tools/src/devboardinfo rename {board/phytium/common => package/phytium-tools/src}/rootfs_resize.sh (100%) diff --git a/board/phytium/common/post-custom-skeleton-debian.sh b/board/phytium/common/post-custom-skeleton-debian.sh index b86f48364..783e4a0d6 100755 --- a/board/phytium/common/post-custom-skeleton-debian.sh +++ b/board/phytium/common/post-custom-skeleton-debian.sh @@ -111,8 +111,6 @@ do_distrorfs_first_stage() { done sudo chmod u+s $RFSDIR/sbin/unix_chkpwd - sudo cp -f board/phytium/common/rootfs_resize.sh $RFSDIR/usr/sbin/ - if [ $4 = bullseye ]; then echo Debian GNU/Linux,11 | tee $RFSDIR/etc/.firststagedone 1>/dev/null elif [ $4 = bookworm ]; then diff --git a/board/phytium/common/post-custom-skeleton-ubuntu.sh b/board/phytium/common/post-custom-skeleton-ubuntu.sh index 4df33dad2..37b498c74 100755 --- a/board/phytium/common/post-custom-skeleton-ubuntu.sh +++ b/board/phytium/common/post-custom-skeleton-ubuntu.sh @@ -114,8 +114,6 @@ do_distrorfs_first_stage() { done sudo chmod u+s $RFSDIR/sbin/unix_chkpwd - sudo cp -f board/phytium/common/rootfs_resize.sh $RFSDIR/usr/sbin/ - if [ $4 = focal ]; then echo Ubuntu,20.04 | tee $RFSDIR/etc/.firststagedone 1>/dev/null elif [ $4 = jammy ]; then diff --git a/package/Config.in b/package/Config.in index 58623893f..3c080b6ff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -258,6 +258,7 @@ menu "Filesystem and flash utilities" source "package/rootfs-chown/Config.in" source "package/kernel-headers/Config.in" source "package/phytium-swap/Config.in" + source "package/phytium-tools/Config.in" endmenu menu "Fonts, cursors, icons, sounds and themes" diff --git a/package/phytium-tools/Config.in b/package/phytium-tools/Config.in new file mode 100644 index 000000000..65a3f5777 --- /dev/null +++ b/package/phytium-tools/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_PHYTIUM_TOOLS + bool "phytium_tools" diff --git a/package/phytium-tools/phytium-tools.mk b/package/phytium-tools/phytium-tools.mk new file mode 100644 index 000000000..e8c9d3792 --- /dev/null +++ b/package/phytium-tools/phytium-tools.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# phytium-tools +# +################################################################################ + +PHYTIUM_TOOLS_VERSION = 0.1 +PHYTIUM_TOOLS_SITE = package/phytium-tools/src +PHYTIUM_TOOLS_SITE_METHOD = local +PHYTIUM_TOOLS_INSTALL_TARGET = YES + +define PHYTIUM_TOOLS_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/bin + + $(INSTALL) -m 755 -D $(@D)/devboardinfo $(TARGET_DIR)/usr/bin/ + $(INSTALL) -m 755 -D $(@D)/rootfs_resize.sh $(TARGET_DIR)/usr/bin/ +endef + +$(eval $(generic-package)) diff --git a/package/phytium-tools/src/devboardinfo b/package/phytium-tools/src/devboardinfo new file mode 100644 index 000000000..efb827422 --- /dev/null +++ b/package/phytium-tools/src/devboardinfo @@ -0,0 +1,86 @@ +#!/bin/bash + +# Some of the regex's used in sed +# Catch basic IP6 address "s/\([0-9a-fA-F]\{1,4\}:\)\{7,7\}[0-9a-fA-F]\{1,4\}/y.y.y.y.y.y.y.y/g" +# Catch y::y.y.y.y "s/[0-9a-fA-F]\{1,4\}:\(:[0-9a-fA-F]\{1,4\}\)\{1,4\}/y::y.y.y.y/g" +# IP4 d.d.d.d decimal "s/\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\}/x.x.x.x/g" +# mac address "s/\([0-9a-fA-F]\{2,2\}\:\)\{5,5\}[0-9a-fA-F]\{2,2\}/m.m.m.m/g" + +OUT=devboardinfo.txt + +rm -f $OUT + +exec > >(tee -ia $OUT) + +echo "System Information" +echo "******************" +echo + +cat /sys/firmware/devicetree/base/model | sed 's/\x0//g' +echo + +cat /etc/os-release | head -4 +echo + +cat /etc/issue +echo +uname -a + +cat /proc/cpuinfo + +echo +echo "Filesystem information" +echo "**********************" + +df +echo +cat /proc/swaps +echo +lsblk + +echo +echo "Networking Information" +echo "**********************" +echo + +ifconfig | sed -e "s/\([0-9a-fA-F]\{1,4\}:\)\{7,7\}[0-9a-fA-F]\{1,4\}/y.y.y.y.y.y.y.y/g" | sed -e "s/[0-9a-fA-F]\{1,4\}:\(:[0-9a-fA-F]\{1,4\}\)\{1,4\}/y::y.y.y.y/g" | sed -e "s/\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\}/x.x.x.x/g" | sed -e "s/\([0-9a-fA-F]\{2,2\}\:\)\{5,5\}[0-9a-fA-F]\{2,2\}/m.m.m.m/g" + + +echo +echo "USB Information" +echo "***************" +echo + +lsusb -t + + +echo +echo "Display Information" +echo "*******************" +echo + +#display_info +xrandr --verbose +echo +sudo cat /sys/kernel/debug/dri/0/state + + +echo +echo "cmdline.txt" +echo "***********" + +cat /proc/cmdline + +echo +echo "dmesg log" +echo "*********" +echo + +dmesg | sed -e "s/\([0-9a-fA-F]\{1,4\}:\)\{7,7\}[0-9a-fA-F]\{1,4\}/y.y.y.y.y.y.y.y/g" | sed -e "s/[0-9a-fA-F]\{1,4\}:\(:[0-9a-fA-F]\{1,4\}\)\{1,4\}/y::y.y.y.y/g" | sed -e "s/\([0-9a-fA-F]\{2,2\}\:\)\{5,5\}[0-9a-fA-F]\{2,2\}/m.m.m.m/g" + +echo +echo "config.txt" +echo "**********" +echo + +zcat /proc/config.gz | egrep -v "^\s*(#|^$)" diff --git a/board/phytium/common/rootfs_resize.sh b/package/phytium-tools/src/rootfs_resize.sh similarity index 100% rename from board/phytium/common/rootfs_resize.sh rename to package/phytium-tools/src/rootfs_resize.sh -- Gitee From 4092321203efc3aeb05fd083efd26af5db174501 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 10:21:42 +0800 Subject: [PATCH 07/16] skeleton-custom: enable ping for user and disable net rename Signed-off-by: lindongping2027 --- board/phytium/common/debian-package-installer | 7 ++++++- board/phytium/common/ubuntu-package-installer | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index 877010422..1afb278f5 100755 --- a/board/phytium/common/debian-package-installer +++ b/board/phytium/common/debian-package-installer @@ -103,10 +103,15 @@ do_distrorfs_second_stage() { sed -i 's/#DROPBEAR_OPTIONS=""/DROPBEAR_OPTIONS="-p 2222"/g' /etc/dropbear/initramfs/dropbear.conf fi + # enable ping for user + echo 'net.ipv4.ping_group_range=1000 1000' | tee -a /etc/sysctl.d/10-custom-ping-group.conf + + # disable net renamed + sed -i '/NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}"/s/^/#/' /lib/udev/rules.d/80-net-setup-link.rules + # clean cached packages apt-get clean - if [ $1 = arm64 ]; then sysarch=aarch64-linux-gnu elif [ $1 = armhf ]; then diff --git a/board/phytium/common/ubuntu-package-installer b/board/phytium/common/ubuntu-package-installer index 25d07db50..2727d12a6 100755 --- a/board/phytium/common/ubuntu-package-installer +++ b/board/phytium/common/ubuntu-package-installer @@ -133,10 +133,15 @@ do_distrorfs_second_stage() { sed -i 's/#DROPBEAR_OPTIONS=""/DROPBEAR_OPTIONS="-p 2222"/g' /etc/dropbear/initramfs/dropbear.conf fi + # enable ping for user + echo 'net.ipv4.ping_group_range=1000 1000' | tee -a /etc/sysctl.d/10-custom-ping-group.conf + + # disable net renamed + sed -i '/NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}"/s/^/#/' /lib/udev/rules.d/80-net-setup-link.rules + # clean cached packages apt-get clean - if [ $1 = arm64 ]; then sysarch=aarch64-linux-gnu elif [ $1 = armhf ]; then -- Gitee From fa39e0d996c626d2311d54165b313489955db2d6 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 15:06:50 +0800 Subject: [PATCH 08/16] update ethercat and xenomai for sdk3.3 Signed-off-by: lindongping2027 --- configs/xenomai_cobalt_6.6.config | 2 +- package/igh-ethercat/igh-ethercat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/xenomai_cobalt_6.6.config b/configs/xenomai_cobalt_6.6.config index f87195f37..7bc4d7bbb 100644 --- a/configs/xenomai_cobalt_6.6.config +++ b/configs/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="kernel-6.6.63-dovetail2_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6.63-dovetail2_v3.3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/cobalt.config" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 7c394197c..ff8636270 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = stable-1.6_v4.1 +IGH_ETHERCAT_VERSION = stable-1.6_v4.2 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) -- Gitee From 16e59102785654fd4d901f7eea48ded9e3d92a74 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 15:08:40 +0800 Subject: [PATCH 09/16] update jailhouse to jailhouse_v2.3 Signed-off-by: lindongping2027 --- package/jailhouse/jailhouse.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 061669e68..4d1c12aa2 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -JAILHOUSE_VERSION = 086b03865bea241c49efd53f5a77891637a2128e +JAILHOUSE_VERSION = jailhouse_v2.3 JAILHOUSE_SITE = https://gitee.com/phytium_embedded/phytium-jailhouse.git JAILHOUSE_SITE_METHOD = git JAILHOUSE_LICENSE = GPL-2.0 -- Gitee From c07a537a1fa94d6603847f8beeb2e4310f5fb0ba Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 15:10:03 +0800 Subject: [PATCH 10/16] update linux version to 3.3 Signed-off-by: lindongping2027 --- configs/kernel_debug.config | 1 - configs/linux_6.6_rt.config | 2 +- configs/phytium_debian_defconfig | 2 +- configs/phytium_defconfig | 2 +- configs/phytium_ubuntu_defconfig | 2 +- configs/xenomai_mercury_6.6.config | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/kernel_debug.config b/configs/kernel_debug.config index 8563849be..a5ce4ba6a 100644 --- a/configs/kernel_debug.config +++ b/configs/kernel_debug.config @@ -1,5 +1,4 @@ # kernel 6.6 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/phytium_debug.config" BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/linux_6.6_rt.config b/configs/linux_6.6_rt.config index b820076ce..eb658e82d 100644 --- a/configs/linux_6.6_rt.config +++ b/configs/linux_6.6_rt.config @@ -1,2 +1,2 @@ # kernel 6.6-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.3" diff --git a/configs/phytium_debian_defconfig b/configs/phytium_debian_defconfig index bcf601902..9dd9cf408 100644 --- a/configs/phytium_debian_defconfig +++ b/configs/phytium_debian_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="kernel-6.6_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.3" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/pe2201-demo-ddr4 phytium/pe2202-chillipi-edu-board phytium/pe2202-demo-ddr4-local phytium/pe2202-demo-ddr4 phytium/pe2202-miniitx-board phytium/pe2202-power-board phytium/pe2204-come-board phytium/pe2204-demo-ddr4-local phytium/pe2204-demo-ddr4 phytium/pe2204-edu-board phytium/pe2204-hanwei-board phytium/pe2204-miniitx-board phytium/pe2204-vpx-board phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytium_defconfig b/configs/phytium_defconfig index b52159caf..ec816c46e 100644 --- a/configs/phytium_defconfig +++ b/configs/phytium_defconfig @@ -38,7 +38,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="kernel-6.6_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.3" BR2_LINUX_KERNEL_DEFCONFIG="phytium" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" diff --git a/configs/phytium_ubuntu_defconfig b/configs/phytium_ubuntu_defconfig index c6543dde5..7b5dd4b9d 100644 --- a/configs/phytium_ubuntu_defconfig +++ b/configs/phytium_ubuntu_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="2a7ebb49038970103032ff6679cd627d848c66f3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6_v3.3" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/pe2201-demo-ddr4 phytium/pe2202-chillipi-edu-board phytium/pe2202-demo-ddr4-local phytium/pe2202-demo-ddr4 phytium/pe2202-miniitx-board phytium/pe2202-power-board phytium/pe2204-come-board phytium/pe2204-demo-ddr4-local phytium/pe2204-demo-ddr4 phytium/pe2204-edu-board phytium/pe2204-hanwei-board phytium/pe2204-miniitx-board phytium/pe2204-vpx-board phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/xenomai_mercury_6.6.config b/configs/xenomai_mercury_6.6.config index f9a59ab6a..94c7978d0 100644 --- a/configs/xenomai_mercury_6.6.config +++ b/configs/xenomai_mercury_6.6.config @@ -1,5 +1,5 @@ # kernel 6.6-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-6.6-rt_v3.3" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y -- Gitee From 195c4f38f51e134b84e5e4e6029a96d84438bf83 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 15:10:33 +0800 Subject: [PATCH 11/16] rm configs/desktop_gnome.config Signed-off-by: lindongping2027 --- configs/desktop_gnome.config | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 configs/desktop_gnome.config diff --git a/configs/desktop_gnome.config b/configs/desktop_gnome.config deleted file mode 100644 index 70a225378..000000000 --- a/configs/desktop_gnome.config +++ /dev/null @@ -1,5 +0,0 @@ -BR2_PACKAGE_ROOTFS_DESKTOP=y -BR2_PACKAGE_PHYTIUM_DESKTOP_TOOLS=y -# Phytium_swap -BR2_PACKAGE_PHYTIUM_SWAP=y -BR2_PACKAGE_GNOME=y -- Gitee From a52b0606896de8a8478b2ef3352815d2f180155b Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Fri, 31 Oct 2025 15:13:25 +0800 Subject: [PATCH 12/16] README: rm desktop_gnome.config Signed-off-by: lindongping2027 --- README.md | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 863dca3e7..e2ee12d8b 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ config文件是功能扩展配置文件，具体的文件及功能如下： |------------------------|--------| | linux_xxx.config | 内核配置文件，含有linux 6.6 rt内核版本 | | desktop.config | XFCE桌面 | -| desktop_gnome.config | GNOME桌面 | | e2000_optee.config | Phytium-optee | | xenomai_xxx.config | cobalt_6.6、mercury_6.6 | | ethercat.config | ethercat | @@ -72,8 +71,8 @@ config文件是功能扩展配置文件，具体的文件及功能如下： defconfig可以和config文件进行组合，用以扩展特定的功能，defconfig与config的组合关系如下： | deconfig | config | |------------------------|--------| -| phytium_ubuntu_defconfig | linux_xxx.config、desktop.config、desktop_gnome.config、e2000_optee.config、xenomai_xxx.config、ethercat.config、jailhouse.config、x100.config、openamp_xxx.config、initramfs.config、kernel_debug.config、host_arm64.config、toolchain_buildroot.config、amdgpu.config、weston.config | -| phytium_debian_defconfig | linux_xxx.config、desktop.config、desktop_gnome.config、e2000_optee.config、xenomai_xxx.config、ethercat.config、jailhouse.config、x100.config、openamp_xxx.config、initramfs.config、host_arm64.config、toolchain_buildroot.config、amdgpu.config、weston.config | +| phytium_ubuntu_defconfig | linux_xxx.config、desktop.config、e2000_optee.config、xenomai_xxx.config、ethercat.config、jailhouse.config、x100.config、openamp_xxx.config、initramfs.config、kernel_debug.config、host_arm64.config、toolchain_buildroot.config、amdgpu.config、weston.config | +| phytium_debian_defconfig | linux_xxx.config、desktop.config、e2000_optee.config、xenomai_xxx.config、ethercat.config、jailhouse.config、x100.config、openamp_xxx.config、initramfs.config、host_arm64.config、toolchain_buildroot.config、amdgpu.config、weston.config | | phytium_defconfig | linux_xxx.config、e2000_optee.config、xenomai_xxx.config、ethercat.config、jailhouse.config、openamp_xxx.config、host_arm64.config、toolchain_buildroot.config | # 编译文件系统 @@ -122,15 +121,6 @@ defconfig中的内核版本默认是linux 6.6。我们支持在编译文件系 （3）镜像的输出位置 生成的根文件系统、内核位于output/images 目录。 -### 支持GNOME桌面 -（1）使用phytium_debian_defconfig或phytium_ubuntu_defconfig作为基础配置项，合并支持desktop_gnome的配置： -`$ ./support/kconfig/merge_config.sh configs/phytium_xxx_defconfig configs/desktop_gnome.config` -注意：X100驱动不支持GNOME桌面，不要将desktop_gnome.config和x100.config合并使用。 -（2）编译 -`$ make` -（3）镜像的输出位置 -生成的根文件系统、内核位于output/images 目录。 - ### 支持Phytium-optee Phytium-optee只支持E2000开发板，关于Phytium-optee的信息请参考：`https://gitee.com/phytium_embedded/phytium-optee` defconfig默认不编译Phytium-optee，如果需要编译Phytium-optee请执行： -- Gitee From 332258d52703fa8740a9e04db9362db9362ebfdd Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Mon, 3 Nov 2025 16:47:48 +0800 Subject: [PATCH 13/16] ubuntu-additional_packages_list: add packages for ubuntu desktop Signed-off-by: lindongping2027 --- board/phytium/common/ubuntu-additional_packages_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/phytium/common/ubuntu-additional_packages_list b/board/phytium/common/ubuntu-additional_packages_list index f854105bc..77b315721 100644 --- a/board/phytium/common/ubuntu-additional_packages_list +++ b/board/phytium/common/ubuntu-additional_packages_list @@ -1,7 +1,7 @@ # additional packages list for SDK main userland gathered from main repo additional_full_packages_list=" " -additional_desktop_packages_list="network-manager-gnome adwaita-icon-theme-full libxmuu-dev libxrender-dev libxft-dev" +additional_desktop_packages_list="network-manager-gnome adwaita-icon-theme-full libxmuu-dev libxrender-dev libxft-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-dri2-0" additional_debian_desktop_packages_list="libxmuu-dev libxrender-dev libxft-dev" -- Gitee From 41495ea4d3cebd58312ed71de806a3bf57814abe Mon Sep 17 00:00:00 2001 From: weishanshan1084 Date: Tue, 28 Oct 2025 15:33:38 +0800 Subject: [PATCH 14/16] copy kernel config to /boot directory Signed-off-by: weishanshan1084 --- package/kernel-headers/kernel_headers_install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/kernel-headers/kernel_headers_install.sh b/package/kernel-headers/kernel_headers_install.sh index 48b1d1f84..3b840963d 100755 --- a/package/kernel-headers/kernel_headers_install.sh +++ b/package/kernel-headers/kernel_headers_install.sh @@ -27,3 +27,5 @@ deploy_kernel_headers_6_6 () { if [[ $2 = 6.6* ]];then deploy_kernel_headers_6_6 $1 $2 $3 $4 fi +# copy .config to /boot +cp $1/usr/src/linux-headers-$2/.config $1/boot/config-$2 -- Gitee From 8b540915d220dc752dba8161bac819ad62dff582 Mon Sep 17 00:00:00 2001 From: weishanshan1084 Date: Mon, 3 Nov 2025 15:10:12 +0800 Subject: [PATCH 15/16] phytium-free-rtos: fix git checkout failure Signed-off-by: weishanshan1084 --- package/phytium-free-rtos/phytium-free-rtos.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/phytium-free-rtos/phytium-free-rtos.mk b/package/phytium-free-rtos/phytium-free-rtos.mk index 9929dbe25..39ddfeaf0 100644 --- a/package/phytium-free-rtos/phytium-free-rtos.mk +++ b/package/phytium-free-rtos/phytium-free-rtos.mk @@ -12,7 +12,7 @@ PHYTIUM_FREE_RTOS_CPU = $(call qstrip,$(BR2_PACKAGE_PHYTIUM_FREE_RTOS_CPU_NAME)) define PHYTIUM_FREE_RTOS_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_MAKE_ENV) ./install.py + PATH=$(BR_PATH) ./install.py endef define PHYTIUM_FREE_RTOS_BUILD_CMDS -- Gitee From 09be73fc91b93ddc14fcfffb1373671dbd5ccd06 Mon Sep 17 00:00:00 2001 From: lindongping2027 Date: Mon, 3 Nov 2025 17:24:11 +0800 Subject: [PATCH 16/16] README: add firefox description Signed-off-by: lindongping2027 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e2ee12d8b..039426bf8 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,10 @@ defconfig中的内核版本默认是linux 6.6。我们支持在编译文件系 （3）镜像的输出位置 生成的根文件系统、内核位于output/images 目录。 +#### Firefox浏览器 +Ubuntu22.04和Ubuntu24.04提供的是snap版的firefox，系统启动后，需要运行`sudo snap install firefox`命令安装firefox snap软件包， +然后点击浏览器图标打开firefox。 + ### 支持Phytium-optee Phytium-optee只支持E2000开发板，关于Phytium-optee的信息请参考：`https://gitee.com/phytium_embedded/phytium-optee` defconfig默认不编译Phytium-optee，如果需要编译Phytium-optee请执行： -- Gitee