diff --git a/board/phytium/common/debian-package-installer b/board/phytium/common/debian-package-installer index 1fdddf9d905e7db1d9585d46976e76ab7c6c9afc..b7d5b5bcf81112d033b0b1eaa477718b3301ebb4 100755 --- a/board/phytium/common/debian-package-installer +++ b/board/phytium/common/debian-package-installer @@ -91,6 +91,10 @@ do_distrorfs_second_stage() { echo 'set-default-sink 1' >> /etc/pulse/default.pa echo 'load-module module-switch-on-connect' >> /etc/pulse/default.pa + # set the configuration of vim + echo 'set mouse-=a' >> /home/user/.vimrc + echo 'syntax on' >> /home/user/.vimrc + echo remove packages. DEBIAN_FRONTEND=noninteractive apt-get -y remove --purge parole || exit 1 fi @@ -103,6 +107,12 @@ do_distrorfs_second_stage() { # set kernel loglevel sed -i 's/#kernel.printk = 3 4 1 3/kernel.printk = 4 4 1 7/' /etc/sysctl.d/99-sysctl.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 + + # enable ping for user + echo 'net.ipv4.ping_group_range=1000 1000' | tee -a /etc/sysctl.d/10-custom-ping-group.conf + if [ $5 = 'phytiumpi' ]; then echo 'defaults.pcm.!card phytiumpe220xi2' >> /etc/asound.conf echo 'defaults.ctl.!card phytiumpe220xi2' >> /etc/asound.conf @@ -117,11 +127,7 @@ do_distrorfs_second_stage() { elif [ $1 = armhf ]; then sysarch=arm-linux-gnueabihf fi - - - [ -f /usr/bin/sudo -a ! -u /usr/bin/sudo ] && chmod +s /usr/bin/sudo - [ -d /var/cache/man ] && chown -R man:root /var/cache/man - [ -d /var/lib/sddm ] && chown -R sddm:sddm /var/lib/sddm + systemctl disable ModemManager.service systemctl disable cups-browsed.service diff --git a/board/phytium/common/desktop_device_table.txt b/board/phytium/common/desktop_device_table.txt new file mode 100644 index 0000000000000000000000000000000000000000..ee7765250758d6e3870e68da3084e9325c13585c --- /dev/null +++ b/board/phytium/common/desktop_device_table.txt @@ -0,0 +1,4 @@ +# +/var/cache/man r 755 man man - - - - - +/var/lib/lightdm r 755 lightdm lightdm - - - - - +/home/user r 755 user user - - - - - diff --git a/board/phytium/common/device_table.txt b/board/phytium/common/device_table.txt new file mode 100644 index 0000000000000000000000000000000000000000..ad7693ed017873113866b8c6bf8ee64cbe10f19c --- /dev/null +++ b/board/phytium/common/device_table.txt @@ -0,0 +1,3 @@ +# +/var/cache/man r 755 man man - - - - - +/home/user r 755 user user - - - - - diff --git a/board/phytium/common/post-build.sh b/board/phytium/common/post-build.sh index 23f14fbfd160997240d893ca554ed0e482545470..8df77d802d0f6587f0665921c6884a0c1f11f6d9 100755 --- a/board/phytium/common/post-build.sh +++ b/board/phytium/common/post-build.sh @@ -3,10 +3,6 @@ main() { # $1 - the current rootfs directory, skeleton-custom or target - if grep -Eq "^BR2_PACKAGE_ROOTFS_CHOWN=y$" ${BR2_CONFIG}; then - ln -sf /lib/systemd/system/systemd-rootfs-chown.service $1/etc/systemd/system/multi-user.target.wants/systemd-rootfs-chown.service - fi - if grep -Eq "^BR2_PACKAGE_PHYTIUM_OPTEE=y$" ${BR2_CONFIG}; then # add tee-supplicant systemd service cp -dpf package/phytium-optee/phytium-tee-supplicant.service $1/lib/systemd/system/phytium-tee-supplicant.service diff --git a/board/phytium/common/post-custom-skeleton-debian.sh b/board/phytium/common/post-custom-skeleton-debian.sh index f8e726f54e422ad40e0948722ab7e75942f0606d..04e71caf6acde0d690a1762340fb29b64fbbe5bd 100755 --- a/board/phytium/common/post-custom-skeleton-debian.sh +++ b/board/phytium/common/post-custom-skeleton-debian.sh @@ -136,7 +136,7 @@ setup_distribution_info () { echo DISTRIB_ID=Phytium > $tgtfile echo DISTRIB_RELEASE=1.0 >> $tgtfile echo DISTRIB_CODENAME=1.0 >> $tgtfile - echo DISTRIB_DESCRIPTION="Phytium Pi OS" >> $tgtfile + echo 'DISTRIB_DESCRIPTION="Phytium Pi OS V2.0"' >> $tgtfile tgtfile=$RFSDIR/etc/update-motd.d/00-header echo '#!/bin/sh' > $tgtfile @@ -146,18 +146,22 @@ setup_distribution_info () { tgtfile=$RFSDIR/etc/update-motd.d/10-help-text echo '#!/bin/sh' > $tgtfile echo 'printf "\n"' >> $tgtfile - echo 'printf " * Support: https://www.phytium.com.cn\n"' >> $tgtfile + echo 'printf " * Support: https://gitee.com/phytium_embedded/phytium-pi-os\n"' >> $tgtfile tgtfile=$RFSDIR/usr/lib/os-release echo NAME=\"$distroname\" > $tgtfile echo VERSION=${DISTROTYPE}-$distroversion >> $tgtfile - echo ID=Phytium >> $tgtfile + echo ID=debian >> $tgtfile echo VERSION_ID=$distroversion >> $tgtfile echo PRETTY_NAME=\" Phytium Pi\" >> $tgtfile echo VERSION_CODENAME=$distro >> $tgtfile - rm -f $RFSDIR/etc/default/motd-news - rm -f $RFSDIR/etc/update-motd.d/50-motd-news + chmod +x $RFSDIR/etc/update-motd.d/00-header + chmod +x $RFSDIR/etc/update-motd.d/10-help-text + #rm -f $RFSDIR/etc/default/motd-news + #rm -f $RFSDIR/etc/update-motd.d/50-motd-news + chmod -x $RFSDIR/etc/update-motd.d/10-uname + echo -n > $RFSDIR/etc/motd fi } diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 5d175e046b9b66202a88eb3a293a297169b4347f..544bbeb85381bf99f7e822b33d3d6823ce6c041a 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_TAR_XZ=y BR2_TARGET_ROOTFS_EXT2_SIZE="2G" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/phytium/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/phytium/genimage-phytiumpi.cfg" # custom skeleton @@ -43,8 +43,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_ROOTFS_LINUX_HEADERS=y # Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y +#BR2_TARGET_GRUB2=y +#BR2_TARGET_GRUB2_ARM64_EFI=y BR2_PACKAGE_PHYUBOOT=y BR2_PACKAGE_PHYUBOOT_RAMSIZE="4GB" @@ -55,7 +55,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # required tools to create the microSD image BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_ROOTFS_CHOWN=y +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt board/phytium/common/device_table.txt" BR2_PACKAGE_BUSYBOX=n diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig index b7e3f92d69b5c656772c38198ae7aa934196b9db..3ee080ed5ec02fef9836ca08ed919c7d5d06c27b 100644 --- a/configs/phytiumpi_desktop_defconfig +++ b/configs/phytiumpi_desktop_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_TAR_XZ=y BR2_TARGET_ROOTFS_EXT2_SIZE="6G" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/phytium/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/phytium/genimage-phytiumpi.cfg" # custom skeleton @@ -43,8 +43,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_ROOTFS_LINUX_HEADERS=y # Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y +#BR2_TARGET_GRUB2=y +#BR2_TARGET_GRUB2_ARM64_EFI=y BR2_PACKAGE_PHYUBOOT=y BR2_PACKAGE_PHYUBOOT_RAMSIZE="4GB" @@ -55,13 +55,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # required tools to create the microSD image BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_ROOTFS_CHOWN=y # Phytium_tools BR2_PACKAGE_PHYTIUM_TOOLS=y BR2_PACKAGE_PHYTIUM_DESKTOP_TOOLS=y BR2_PACKAGE_ROOTFS_DESKTOP=y +BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt board/phytium/common/desktop_device_table.txt" BR2_PACKAGE_BUSYBOX=n # Vpu-lib diff --git a/package/phyuboot/phyuboot.mk b/package/phyuboot/phyuboot.mk index 01440e0a0b9ad53ed80b195bc89cc10bd71d0bc9..e38219c6551203703ccef13a402f4d8daa2c2c12 100644 --- a/package/phyuboot/phyuboot.mk +++ b/package/phyuboot/phyuboot.mk @@ -4,9 +4,10 @@ # ################################################################################ -PHYUBOOT_VERSION = 1.32-v2.1 -PHYUBOOT_SITE = package/phyuboot/src -PHYUBOOT_SITE_METHOD = local +PHYUBOOT_VERSION = 450cf1800670422e9a39b1589f2d1257ccb6ad24 +PHYUBOOT_SITE = https://gitee.com/phytium_embedded/phytium-rogue-umlibs.git +PHYUBOOT_SITE_METHOD = git + PHYUBOOT_DEPENDENCIES = linux host-dtc MKIMAGE_PI = $(HOST_DIR)/bin/mkimage_phypi # The only available license files are in PDF and RTF formats, and we @@ -16,9 +17,9 @@ PHYUBOOT_INSTALL_IMAGES = YES PHYUBOOT_RAMSIZE = $(BR2_PACKAGE_PHYUBOOT_RAMSIZE) define PHYUBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0777 $(@D)/fip-all-optee-$(BR2_PACKAGE_PHYUBOOT_RAMSIZE).bin $(BINARIES_DIR)/fip-all.bin - $(INSTALL) -D -m 0777 $(@D)/kernel.its $(BINARIES_DIR)/kernel.its - $(INSTALL) -D -m 755 $(@D)/mkimage $(HOST_DIR)/bin/mkimage_phypi + $(INSTALL) -D -m 0777 $(@D)/phyuboot/fip-all-optee-$(BR2_PACKAGE_PHYUBOOT_RAMSIZE).bin $(BINARIES_DIR)/fip-all.bin + $(INSTALL) -D -m 0777 $(PHYUBOOT_PKGDIR)/src/kernel.its $(BINARIES_DIR)/kernel.its + $(INSTALL) -D -m 755 $(PHYUBOOT_PKGDIR)/src/mkimage $(HOST_DIR)/bin/mkimage_phypi PATH=$(BR_PATH) $(MKIMAGE_PI) -f $(BINARIES_DIR)/kernel.its $(BINARIES_DIR)/fitImage endef diff --git a/package/phyuboot/src/fip-all-optee-2GB.bin b/package/phyuboot/src/fip-all-optee-2GB.bin deleted file mode 100644 index fd0e4b09ecec027cb0a5d4daad01755892a0fdc7..0000000000000000000000000000000000000000 Binary files a/package/phyuboot/src/fip-all-optee-2GB.bin and /dev/null differ diff --git a/package/phyuboot/src/fip-all-optee-4GB.bin b/package/phyuboot/src/fip-all-optee-4GB.bin deleted file mode 100644 index 12f62778a55cdffa8f77744bd37b1e574fff69e7..0000000000000000000000000000000000000000 Binary files a/package/phyuboot/src/fip-all-optee-4GB.bin and /dev/null differ