Merge pull request #282 from JacobZang/master

archives/filesystem/special/Edge2:

config/boards/Edge2.conf

@@ -410,7 +410,7 @@ customize_platform() {
 
 		mount_chroot "$ROOTFS_TEMP"
 
-		if [ "$LINUX" == "6.1" ]; then
+		if [ "$DISTRIB_RELEASE" == "noble" ]; then
 			cat <<-EOF | tee $ROOTFS_TEMP/etc/apt/sources.list.d/jjriek-ubuntu-panfork-mesa-noble.list
 			deb https://ppa.launchpadcontent.net/jjriek/panfork-mesa/ubuntu/ noble main
 			# deb-src deb https://ppa.launchpadcontent.net/jjriek/panfork-mesa/ubuntu/ noble main
@@ -420,19 +420,19 @@ customize_platform() {
 			deb https://ppa.launchpadcontent.net/jjriek/rockchip-multimedia/ubuntu/ noble main
 			# deb-src deb https://ppa.launchpadcontent.net/jjriek/rockchip-multimedia/ubuntu/ noble main
 			EOF
-			cp $CONFIG/panfork-6.1.key $ROOTFS_TEMP
-			eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "cat panfork-6.1.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/panfork-6.1.gpg"'
-			rm $ROOTFS_TEMP/panfork-6.1.key
+			cp $CONFIG/panfork-noble.key $ROOTFS_TEMP
+			eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "cat panfork-noble.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/panfork-noble.gpg"'
+			rm $ROOTFS_TEMP/panfork-noble.key
 		fi
 
-		if [ "$LINUX" == "5.10" ]; then
+		if [ "$DISTRIB_RELEASE" == "jammy" ]; then
 			cat <<-EOF | tee $ROOTFS_TEMP/etc/apt/sources.list.d/liujianfeng1994-ubuntu-panfork-mesa-jammy.list
 			deb https://ppa.launchpadcontent.net/liujianfeng1994/panfork-mesa/ubuntu/ jammy main
 			# deb-src https://ppa.launchpadcontent.net/liujianfeng1994/panfork-mesa/ubuntu/ jammy main
 			EOF
-			cp $CONFIG/panfork-5.10.key $ROOTFS_TEMP
-			eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "cat panfork-5.10.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/panfork-5.10.gpg"'
-			rm $ROOTFS_TEMP/panfork-5.10.key
+			cp $CONFIG/panfork-jammy.key $ROOTFS_TEMP
+			eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "cat panfork-jammy.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/panfork-jammy.gpg"'
+			rm $ROOTFS_TEMP/panfork-jammy.key
 		fi
 
 		# this should fix resolvconf installation failure in some cases
@@ -446,7 +446,17 @@ customize_platform() {
 		eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y $apt_extra update"'
 		eval 'LC_ALL=C LANG=C chroot $ROOTFS_TEMP /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y $apt_extra dist-upgrade"'
 		mkdir -p $ROOTFS_TEMP/lib/firmware/mali_csffw_g15p0/
-		cp $ROOT/archives/filesystem/special/Edge2/lib/firmware/mali_csffw.bin $ROOTFS_TEMP/lib/firmware/mali_csffw_g15p0/
+		cp $ROOT/archives/filesystem/special/Edge2/lib/firmware/mali_csffw_6.1.bin $ROOTFS_TEMP/lib/firmware/mali_csffw_g15p0/mali_csffw.bin
+		rm $ROOTFS_TEMP/lib/firmware/mali_csffw_6.1.bin $ROOTFS_TEMP/lib/firmware/mali_csffw_5.10.bin 
+
+		umount_chroot "$ROOTFS_TEMP"
+	elif [ "$LINUX" == "5.10" ] && [ "$DISTRIB_RELEASE" == "noble" ]; then
+		info_msg "Preparing MALI GPU"
+
+		mount_chroot "$ROOTFS_TEMP"
+
+		cp $ROOT/archives/filesystem/special/Edge2/lib/firmware/mali_csffw_5.10.bin $ROOTFS_TEMP/lib/firmware/mali_csffw.bin
+		rm $ROOTFS_TEMP/lib/firmware/mali_csffw_6.1.bin $ROOTFS_TEMP/lib/firmware/mali_csffw_5.10.bin 
 
 		umount_chroot "$ROOTFS_TEMP"
 	fi