add vuplus-fpga-update in vuuno/vuultimo.

5 files changed, 28 insertions, 5 deletions

diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
index 43c30b3..2540a13 100644
--- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf
+++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
@@ -13,6 +13,7 @@ VUPLUS_FEATURES += "hbbtv"
 VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "vuplus-fpga-update"
 
 IMAGE_UNPACK_PATH = "vuplus/ultimo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "3894"
diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index ba669e7..74f4062 100644
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -11,6 +11,7 @@ VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "fpgaupgrade"
+VUPLUS_FEATURES += "vuplus-fpga-update"
 
 IMAGE_UNPACK_PATH = "vuplus/uno"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
index a138a79..68e0461 100644
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
@@ -2,12 +2,13 @@ SUMMARY = "Vuplus: Base Task for Vuplus."
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit task
 
 VUPLUS_BASE_ESSENTIAL = "\
   autofs \
+  base-files-doc \
   vuplus-compat \
   dreambox-keymaps \
   e2fsprogs-e2fsck \
@@ -43,7 +44,7 @@ VUPLUS_FIRMWARE_DVB = " \
   firmware-drxd-a2 \
 "
 
-# chang : use xinetd instead of netkit-base.
+# chang : use inetd in busybox instead of netkit-base.
 # chang : mkfs-ubifs and mkfs-jffs2 are included in mtd-utils.
 
 VUPLUS_BASE_RECOMMENDS = "\
@@ -52,11 +53,9 @@ VUPLUS_BASE_RECOMMENDS = "\
   sambaserver \
   openvpn \
   zeroconf \
+  ${@base_contains("VUPLUS_FEATURES", "vuplus-fpga-update", "vuplus-fpga-update", "", d)} \
 "
 
-#VUPLUS_BASE_RECOMMENDS_append_vuuno = " vuplus-fpga-update"
-#VUPLUS_BASE_RECOMMENDS_append_vuultimo = " vuplus-fpga-update"
-
 VUPLUS_BASE_OPTIONAL_RECOMMENDS = "\
   hddtemp \
   joe \
diff --git a/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update.bb b/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update.bb
new file mode 100644
index 0000000..19096c8
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "vuplus fpga updater"
+SECTION = "base"
+PRIORITY = "required"
+LICENSE = "proprietary"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+
+PV = "1.0"
+PR = "r0"
+
+SRC_URI = "file://dp_user_fpga"
+
+S = "${WORKDIR}"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+do_install() {
+	install -d ${D}/usr/bin
+	install -m 0755 ${WORKDIR}/dp_user_fpga ${D}/usr/bin/dp_user_fpga
+}
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+FILES_${PN} = "/"
diff --git a/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update/dp_user_fpga b/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update/dp_user_fpga
new file mode 100755
index 0000000..13db375
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update/dp_user_fpga