X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=recipes%2Fvuplus%2Fvuplus-bootlogo.bb;h=ac1d0555d818ee50696eff2dc29ae3dfd821f89d;hb=df7fcc206284ac27054edece8074a122ffee41bd;hp=f12b330c8ddbcbeaa2afbbef5f34582d223cfcaf;hpb=627a68310528184cbbe32b864c91f7e8ab7f4ff3;p=vuplus_openembedded

diff --git a/recipes/vuplus/vuplus-bootlogo.bb b/recipes/vuplus/vuplus-bootlogo.bb
index f12b330..ac1d055 100644
--- a/recipes/vuplus/vuplus-bootlogo.bb
+++ b/recipes/vuplus/vuplus-bootlogo.bb
@@ -4,14 +4,16 @@ PRIORITY = "required"
 LICENSE = "proprietary"
 
 IMAGES_VERSION = "1"
-BINARY_VERSION = "1"
-BINARY_VERSION_bm750 = "6"
+BINARY_VERSION = "7"
 
 PV = "${BINARY_VERSION}.${IMAGES_VERSION}"
-PR = "r3"
+PR = "r5"
 
+KERNEL_VERSION = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}"
 
 SRC_URI = "file://bootlogo.mvi file://backdrop.mvi file://bootlogo_wait.mvi file://switchoff.mvi"
+SRC_URI_append_vuuno = " file://splash_cfe_auto.bin"
+SRC_URI_append_vuultimo = " file://splash_cfe_auto.bin"
 
 S = "${WORKDIR}/"
 
@@ -19,15 +21,6 @@ MVI = "bootlogo backdrop bootlogo_wait"
 
 do_install() {
 	install -d ${D}/boot
-	install -m 0755 ${S}/bootlogo-${MACHINE}-${BINARY_VERSION}.elf ${D}/boot/bootlogo.elf
-	for i in ${MVI}; do
-		install -m 0755 ${S}/$i-${MACHINE}-${IMAGES_VERSION}.mvi ${D}/boot/$i.mvi;
-	done;
-}
-
-
-do_install_vuplus() {
-	install -d ${D}/boot
 	install -d ${D}/usr/share
 	for i in ${MVI}; do
 		install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
@@ -35,20 +28,47 @@ do_install_vuplus() {
 	done;
 }
 
+do_install_vuuno() {
+	install -d ${D}/boot
+        install -d ${D}/usr/share
+        for i in ${MVI}; do
+                install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
+                ln -sf /usr/share/$i.mvi ${D}/boot/$i.mvi;
+        done;
+        install -m 0755 ${S}/splash_cfe_auto.bin ${D}/boot/splash_cfe_auto.bin
+}
+do_install_vuultimo() {
+        install -d ${D}/boot
+        install -d ${D}/usr/share
+        for i in ${MVI}; do
+                install -m 0755 ${S}/$i.mvi ${D}/usr/share/$i.mvi;
+                ln -sf /usr/share/$i.mvi ${D}/boot/$i.mvi;
+        done;
+        install -m 0755 ${S}/splash_cfe_auto.bin ${D}/boot/splash_cfe_auto.bin
+}
+
 pkg_preinst() {
-	[ -d /proc/stb ] && mount -o rw,remount /boot
+	if [ "${KERNEL_VERSION}" = "3.1.1" ]; then
+		[ -d /proc/stb ] && mount -o rw,remount /boot
+	fi
 }
 
 pkg_postinst() {
-	[ -d /proc/stb ] && mount -o ro,remount /boot
+	if [ "${KERNEL_VERSION}" = "3.1.1" ]; then
+		[ -d /proc/stb ] && mount -o ro,remount /boot
+	fi
 }
 
 pkg_prerm() {
-	[ -d /proc/stb ] && mount -o rw,remount /boot
+	if [ "${KERNEL_VERSION}" = "3.1.1" ]; then
+		[ -d /proc/stb ] && mount -o rw,remount /boot
+	fi
 }
 
 pkg_postrm() {
-	[ -d /proc/stb ] && mount -o ro,remount /boot
+	if [ "${KERNEL_VERSION}" = "3.1.1" ]; then
+		[ -d /proc/stb ] && mount -o ro,remount /boot
+	fi
 }
 
 PACKAGE_ARCH := "${MACHINE_ARCH}"