Update for Orange Pi RV

external/config/desktop/sid/appgroups

@@ -0,0 +1 @@
+../bookworm/appgroups/

external/config/desktop/sid/environments/gnome/orangepi/create_desktop_package.sh

@@ -1,186 +1,32 @@
-## install lightdm greeter
-##cp -R "${EXTER}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian
-#
-## install default desktop settings
-#mkdir -p "${destination}"/etc/skel
-#cp -R "${EXTER}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
-#
-##install cinnamon desktop bar icons
-##mkdir -p "${destination}"/usr/share/icons/armbian
-##cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/armbian
-#
-## install wallpapers
-#mkdir -p "${destination}"/usr/share/backgrounds/orangepi/
-#cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi
-#
-## install wallpapers
-##mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/
-##cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/armbian-lightdm
-#
-## install logo for login screen
-#mkdir -p "${destination}"/usr/share/pixmaps/orangepi
-#cp "${EXTER}"/packages/blobs/desktop/icons/orangepi.png "${destination}"/usr/share/pixmaps/orangepi
-#
-##generate wallpaper list for background changer
-#mkdir -p "${destination}"/usr/share/gnome-background-properties
-#cat <<-EOF > "${destination}"/usr/share/gnome-background-properties/orangepi.xml
-#<?xml version="1.0"?>
-#<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-#<wallpapers>
-#  <wallpaper deleted="false">
-#    <name>OrangePi light</name>
-#    <filename>/usr/share/backgrounds/orangepi/orangepi-default.png</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>OrangePi dark</name>
-#    <filename>/usr/share/backgrounds/orangepi/orangepi-default.png</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#</wallpapers>
-#EOF
+# install default desktop settings
+mkdir -p "${destination}"/etc/skel
+cp -R "${EXTER}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
 
+# install logo for login screen
+mkdir -p "${destination}"/usr/share/pixmaps/orangepi
+cp "${EXTER}"/packages/blobs/desktop/icons/orangepi.png "${destination}"/usr/share/pixmaps/orangepi
 
-#cat <<EOF > "${destination}"/usr/share/gnome-background-properties/armbian.xml
-#<?xml version="1.0"?>
-#<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-#<wallpapers>
-#  <wallpaper deleted="false">
-#    <name>Armbian black-pyscho</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-black-psycho.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian bluie-circle</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian blue-monday</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian blue-penguin</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-penguin.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian gray-resultado</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-gray.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian green-penguin</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-green-penguin.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian green-retro</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-green-retro.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian green-wall-penguin</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-green-wall-penguin.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian 4k-neglated</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-neglated.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian neon-gray-penguin</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-neon-gray-penguin.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian plastic-love</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-plastic-love.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian purple-penguine</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-purple-penguine.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#    <wallpaper deleted="false">
-#    <name>Armbian purplepunk-resultado</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-purplepunk.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian red-penguin-dark</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-red-penguin-dark.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian red-penguin</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-4k-red-penguin.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian light</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian dark</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian uc</name>
-#    <filename>/usr/share/backgrounds/armbian/armbian-full-under-construction-3840-2160.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#  <wallpaper deleted="false">
-#    <name>Armbian clear</name>
-#    <filename>/usr/share/backgrounds/armbian/Armbian-clear-rounded-bakcground-3840-2160.jpg</filename>
-#    <options>zoom</options>
-#    <pcolor>#ffffff</pcolor>
-#    <scolor>#000000</scolor>
-#  </wallpaper>
-#</wallpapers>
-#EOF
+# install wallpapers
+mkdir -p "${destination}"/usr/share/backgrounds/gnome/
+cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/orangepi*.png "${destination}"/usr/share/backgrounds/gnome/
+mkdir -p "${destination}"/usr/share/gnome-background-properties
+cat <<-EOF > "${destination}"/usr/share/gnome-background-properties/orangepi.xml
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>OrangePi light</name>
+    <filename>/usr/share/backgrounds/gnome/orangepi-default.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper deleted="false">
+    <name>OrangePi dark</name>
+    <filename>/usr/share/backgrounds/gnome/orangepi-default.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
+EOF

external/config/sources/families/starfive2.conf

@@ -21,6 +21,7 @@ case "${BRANCH}" in
 
 		KERNELBRANCH="branch:orange-pi-5.15-jh7110"
 		KERNELPATCHDIR="starfive2-${BRANCH}"
+		UBOOT_TARGET_MAP=";;u-boot-spl.bin.normal.out visionfive2_fw_payload.img"
 		;;
 
 esac
@@ -69,7 +70,7 @@ family_tweaks()
 	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y libevent-dev libdbus-glib-1-dev"
 	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y libopenal-dev libcdio-paranoia-dev libdc1394-dev libcaca-dev libv4l-dev libpocketsphinx-dev libbs2b-dev liblilv-0-0 librubberband-dev libmysofa-dev libflite1 libass-dev libvidstab-dev libzmq3-dev libzimg-dev libgme-dev libopenmpt-dev libchromaprint-dev librabbitmq-dev libssh-dev libsrt-openssl-dev liba52-0.7.4-dev libhwy1 libjxl0.7"
 	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y fonts-freefont-ttf libaribb24-0 libcddb2 libdvbpsi10 libebml5 libixml10 liblirc-client0 liblua5.2-0 libmad0 libmatroska7 libprotobuf-lite32 libqt5x11extras5 libresid-builder0c2a libsdl-image1.2 libsdl1.2debian libsidplay2 libspatialaudio0 libupnp13 libva-wayland2 libvncclient1 libopenmpt-modplug1 libxcb-composite"
-	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y qtwayland5 v4l-utils"
+	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y qtwayland5"
 
 	dpkg_install_debs_chroot ${packages_dir}
 	#dpkg_install_deb_chroot ${packages_dir}/firefox_105.0_202305_riscv64.deb
@@ -89,9 +90,16 @@ family_tweaks()
 	rm -rf $SDCARD/usr/local/bin/openssl
 
 	echo -e "\nWaylandEnable=true" >> ${SDCARD}/etc/gdm3/daemon.conf
+	rm -rf ${SDCARD}/root/*.deb
+	sed -i 's/# *AutomaticLoginEnable = true/AutomaticLoginEnable = true/' ${SDCARD}/etc/gdm3/daemon.conf
+	sed -i 's/# *AutomaticLogin = user1/AutomaticLogin = orangepi/' ${SDCARD}/etc/gdm3/daemon.conf
+	cp $EXTER/packages/blobs/desktop/desktop-wallpapers/orangepi-default.png ${SDCARD}/usr/share/backgrounds/warty-final-ubuntu.png
+	run_on_sdcard "systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target" > /dev/null 2>&1
+	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y blueman"
+
 	fi
 
+	run_on_sdcard "DEBIAN_FRONTEND=noninteractive apt-get install -y v4l-utils mtd-utils bluez"
 	echo 'set-card-profile alsa_card.platform-soc_snd-card6 pro-audio' >> ${SDCARD}/etc/pulse/default.pa
 	rsync -a --chown=root:root "${EXTER}"/packages/bsp/jh7110/* ${SDCARD}/
-	run_on_sdcard "systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target" > /dev/null 2>&1
 }

external/packages/bsp/jh7110/usr/local/bin/auto_login_cli.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [[ -z $1 ]]; then
+	user=root
+else
+	user=$1
+fi
+
+[[ -d /etc/systemd/system/getty.target.wants/ ]] && rm /etc/systemd/system/getty.target.wants/ -rf
+
+if [[ $1 == "-d" ]]; then
+	exit
+fi
+
+mkdir -p /etc/systemd/system/getty.target.wants/
+cat <<-EOF >  \
+/etc/systemd/system/getty.target.wants/serial-getty@ttyS0.service
+[Service]
+ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
+ExecStart=
+ExecStart=-/sbin/agetty --noissue --autologin ${user} %I \$TERM
+Type=idle
+EOF

scripts/distributions.sh

@@ -457,7 +457,7 @@ POST_INSTALL_KERNEL_DEBS
 	# copy watchdog test programm
 	cp "${EXTER}"/packages/blobs/watchdog/watchdog_test_${ARCH} "${SDCARD}"/usr/local/bin/watchdog_test
 
-	[[ -f "${SDCARD}"/usr/bin/gnome-session ]] && sed -i "s/user-session.*/user-session=ubuntu-wayland/" ${SDCARD}/etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf
+	[[ -f "${SDCARD}"/usr/bin/gnome-session ]] && sed -i "s/user-session.*/user-session=ubuntu-wayland/" ${SDCARD}/etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf > /dev/null 2>&1
 	[[ -f "${SDCARD}"/usr/bin/startplasma-x11 ]] && sed -i "s/user-session.*/user-session=plasma-x11/" ${SDCARD}/etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf
 
 	# execute $LINUXFAMILY-specific tweaks