From 330a21525716476ab68013e5e4ca9be1b5b58624 Mon Sep 17 00:00:00 2001
From: kos <kos@dev3>
Date: Tue, 9 Jul 2013 14:58:27 +0900
Subject: [PATCH 1/1] [duo2] add web-manual.

---
 meta-bsp/vuduo2/conf/machine/vuduo2.conf                    |  1 +
 meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend       |  6 ++++++
 meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend      |  6 ++++++
 meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb |  2 +-
 meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb   | 12 ++++--------
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend
 create mode 100644 meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend

diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index a7ffe12..50024f7 100644
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -16,6 +16,7 @@ VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "webif"
 VUPLUS_FEATURES += "autoshutdown"
 VUPLUS_FEATURES += "transcoding"
+VUPLUS_FEATURES += "webmanual"
 
 IMAGE_UNPACK_PATH = "vuplus/duo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend
new file mode 100644
index 0000000..206ff13
--- /dev/null
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend
@@ -0,0 +1,6 @@
+SRC_DATE = "20130709_p0"
+IMAGE_DIR = "Vu+-Duo2-User-Manual_english_D0610-web-images"
+
+SRC_URI[md5sum] = "32ce9722ca8695813d32970f9e05d010"
+SRC_URI[sha256sum] = "84243dce53a382638eb03af7cc8b190cb403053adf1f1e0c95f15eb485dab9ac"
+
diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend
new file mode 100644
index 0000000..f056526
--- /dev/null
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend
@@ -0,0 +1,6 @@
+SRC_DATE = "20121018_p1"
+IMAGE_DIR = "image"
+
+SRC_URI[md5sum] = "099122a07aa40142c0dee5fd2bbf9cc2"
+SRC_URI[sha256sum] = "8e5b4857bae757e8ef28c88a290408ed59035298510ac0242cc959678babf4c3"
+
diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb
index b3cbd4f..7dea47f 100644
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 RDEPENDS_${PN} = " \
 "
diff --git a/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb b/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb
index 2b49591..17fc4ab 100644
--- a/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb
+++ b/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb
@@ -3,8 +3,6 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "CLOSED"
 
-SRC_DATE = "20121018_p1"
-
 PR = "${SRC_DATE}_r0"
 SRC_URI = "http://code.vuplus.com/download/build.fc3abf29fb03f797e78f907928125638/embedded/vuplus_manual/${MACHINE}_${SRC_DATE}.tar.gz"
 
@@ -16,19 +14,19 @@ do_compile() {
 
 do_install() {
         install -d ${D}/usr/local/manual
-        install -d ${D}/usr/local/manual/image
+        install -d ${D}/usr/local/manual/${IMAGE_DIR}
 	for f in *.html; do
                 install -m 0644 ${WORKDIR}/${MACHINE}/$f ${D}/usr/local/manual/;
         done
 
 	for f in *.jpeg; do
-                install -m 0644 ${WORKDIR}/${MACHINE}/image/$f ${D}/usr/local/manual/image/;
+                install -m 0644 ${WORKDIR}/${MACHINE}/${IMAGE_DIR}/$f ${D}/usr/local/manual/${IMAGE_DIR}/;
 	done
 	for f in *.jpg; do
-                install -m 0644 ${WORKDIR}/${MACHINE}/image/$f ${D}/usr/local/manual/image/;
+                install -m 0644 ${WORKDIR}/${MACHINE}/${IMAGE_DIR}/$f ${D}/usr/local/manual/${IMAGE_DIR}/;
 	done
         for f in *.png; do
-                install -m 0644 ${WORKDIR}/${MACHINE}/image/$f ${D}/usr/local/manual/image/;
+                install -m 0644 ${WORKDIR}/${MACHINE}/${IMAGE_DIR}/$f ${D}/usr/local/manual/${IMAGE_DIR}/;
         done
 }
 
@@ -37,5 +35,3 @@ PACKAGE_ARCH := "${MACHINE_ARCH}"
 PACKAGES = "${PN}"
 FILES_${PN} = "/"
 
-SRC_URI[md5sum] = "099122a07aa40142c0dee5fd2bbf9cc2"
-SRC_URI[sha256sum] = "8e5b4857bae757e8ef28c88a290408ed59035298510ac0242cc959678babf4c3"
-- 
2.7.4