fixed machine config.

added missing packages.

15 files changed, 339 insertions, 15 deletions

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index 542cabd..3615993 100644
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -5,7 +5,6 @@
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_simple"
 
-VUPLUS_FEATURES += "blindscan"
 VUPLUS_FEATURES += "hbbtv"
 VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.3.6/brcm_remove_entire_mtd.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.3.6/brcm_remove_entire_mtd.patch
new file mode 100644
index 0000000..96ed644
--- /dev/null
+++ b/meta-bsp/common/recipes/linux/linux-vuplus-3.3.6/brcm_remove_entire_mtd.patch
@@ -0,0 +1,17 @@
+diff --git a/drivers/brcmstb/board.c b/drivers/brcmstb/board.c
+index 5d2c870..92d54cc 100644
+--- a/drivers/brcmstb/board.c
++++ b/drivers/brcmstb/board.c
+@@ -499,9 +499,9 @@ int __init board_get_partition_map(struct mtd_partition **p)
+ 	ret[0].size = brcm_mtd_rootfs_len;
+ 	ret[0].name = "rootfs";
+ 
+-	ret[1].offset = 0;
+-	ret[1].size = MTDPART_SIZ_FULL;
+-	ret[1].name = "entire_device";
++	ret[1].offset = brcm_mtd_rootfs_start;
++	ret[1].size = brcm_mtd_rootfs_len;
++	ret[1].name = "rootfs(redundant)";
+ 
+ 	if (brcm_mtd_kernel_len != 0) {
+ 		ret[2].offset = brcm_mtd_kernel_start;
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
index 9ab8308..1a34a41 100644
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "2.6.37"
 
-PR = "r2"
+PR = "r3"
 SRCREV = ""
 
 MODULE = "linux-2.6.37"
@@ -15,6 +15,7 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.3.6-1.2.tar.bz2
         file://fix_cpu_proc.patch;patch=1;pnum=1 \
         file://brcm_mtd_mac.patch;patch=1;pnum=1 \
         file://dvb_core_5.5.patch;patch=1;pnum=1 \
+	file://brcm_remove_entire_mtd.patch;patch=1;pnum=1 \
         file://${MACHINE}_defconfig \
 	"
 
diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf
index 3151690..ac0330b 100644
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 
 VUPLUS_FEATURES = ""
-VUPLUS_FEATURES += "blindscan"
 VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
index 7bdf989..e436584 100644
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -7,12 +7,13 @@ MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
 VUPLUS_FEATURES += "firmwareupgrade"
-VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "webmanual"
 VUPLUS_FEATURES += "hbbtv"
 VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "webif"
+VUPLUS_FEATURES += "autoshutdown"
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/vusolo2/recipes/linux/linux-vuplus-3.3.6/vusolo2_defconfig b/meta-bsp/vusolo2/recipes/linux/linux-vuplus-3.3.6/vusolo2_defconfig
index f2da2e7..e063224 100644
--- a/meta-bsp/vusolo2/recipes/linux/linux-vuplus-3.3.6/vusolo2_defconfig
+++ b/meta-bsp/vusolo2/recipes/linux/linux-vuplus-3.3.6/vusolo2_defconfig
@@ -242,7 +242,7 @@ CONFIG_SMP=y
 CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_48 is not set
@@ -301,6 +301,7 @@ CONFIG_TREE_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -1951,18 +1952,18 @@ CONFIG_USB_STORAGE=y
 # USB port drivers
 #
 CONFIG_USB_SERIAL=m
-# CONFIG_USB_EZUSB is not set
-# CONFIG_USB_SERIAL_GENERIC is not set
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
 # CONFIG_USB_SERIAL_CP210X is not set
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_FUNSOFT is not set
 # CONFIG_USB_SERIAL_VISOR is not set
 # CONFIG_USB_SERIAL_IPAQ is not set
@@ -1973,7 +1974,19 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_IPW is not set
 # CONFIG_USB_SERIAL_IUU is not set
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
@@ -1981,7 +1994,7 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
+CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_QCAUX is not set
 # CONFIG_USB_SERIAL_QUALCOMM is not set
@@ -1994,7 +2007,8 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_TI is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_OPTICON is not set
 # CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
@@ -2327,7 +2341,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch
new file mode 100644
index 0000000..9e2f508
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch
@@ -0,0 +1,143 @@
+diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h
+--- cdrkit-1.1.9.orig/include/schily.h	2006-11-25 01:20:20.000000000 +0100
++++ cdrkit-1.1.9/include/schily.h	2009-03-11 20:31:53.000000000 +0100
+@@ -116,7 +116,7 @@ extern	int	fexecl(const char *, FILE *, 
+ extern	int	fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...);
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv(const char *, FILE *, FILE *, FILE *, int, char **);
+-extern	int	fexecve(const char *, FILE *, FILE *, FILE *, char * const *, 
++extern	int	f_execve(const char *, FILE *, FILE *, FILE *, char * const *, 
+ 							  char * const *);
+ extern	int	fspawnv(FILE *, FILE *, FILE *, int, char * const *);
+ extern	int	fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...);
+@@ -190,7 +190,7 @@ extern	int	schily_error(const char *, ..
+ extern	char	*fillbytes(void *, int, char);
+ extern	char	*findbytes(const void *, int, char);
+ extern	int	findline(const char *, char, const char *, int, char **, int);
+-extern	int	getline(char *, int);
++extern	int	get_line(char *, int);
+ extern	int	getstr(char *, int);
+ extern	int	breakline(char *, char, char **, int);
+ extern	int	getallargs(int *, char * const**, const char *, ...);
+diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c
+--- cdrkit-1.1.9.orig/librols/fexec.c	2008-02-25 12:14:07.000000000 +0100
++++ cdrkit-1.1.9/librols/fexec.c	2009-03-11 20:31:53.000000000 +0100
+@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist)
+ 	} while (p != NULL);
+ 	va_end(args);
+ 
+-	ret = fexecve(name, in, out, err, av, env);
++	ret = f_execve(name, in, out, err, av, env);
+ 	if (av != xav)
+ 		free(av);
+ 	return (ret);
+@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av)
+ 	char *av[];
+ {
+ 	av[ac] = NULL;			/*  force list to be null terminated */
+-	return (fexecve(name, in, out, err, av, environ));
++	return (f_execve(name, in, out, err, av, environ));
+ }
+ 
+ EXPORT int
+-fexecve(name, in, out, err, av, env)
++f_execve(name, in, out, err, av, env)
+ 	const char *name;
+ 	FILE *in, *out, *err;
+ 	char * const av[], * const env[];
+diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c
+--- cdrkit-1.1.9.orig/librols/stdio/fgetline.c	2006-09-05 10:39:04.000000000 +0200
++++ cdrkit-1.1.9/librols/stdio/fgetline.c	2009-03-11 20:31:53.000000000 +0100
+@@ -76,7 +76,7 @@ fgetline(f, buf, len)
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++get_line(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c
+--- cdrkit-1.1.9.orig/libusal/scsitransp.c	2008-02-25 12:14:07.000000000 +0100
++++ cdrkit-1.1.9/libusal/scsitransp.c	2009-03-11 20:31:53.000000000 +0100
+@@ -301,7 +301,7 @@ usal_yes(char *msg)
+ 
+ 	printf("%s", msg);
+ 	flush();
+-	if (getline(okbuf, sizeof (okbuf)) == EOF)
++	if (get_line(okbuf, sizeof (okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if (streql(okbuf, "y") || streql(okbuf, "yes") ||
+ 	    streql(okbuf, "Y") || streql(okbuf, "YES"))
+diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c
+--- cdrkit-1.1.9.orig/readom/io.c	2006-12-08 14:38:43.000000000 +0100
++++ cdrkit-1.1.9/readom/io.c	2009-03-11 20:31:53.000000000 +0100
+@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi
+ 		(*prt)(s, *lp, mini, maxi, dp);
+ 		flush();
+ 		line[0] = '\0';
+-		if (getline(line, 80) == EOF)
++		if (get_line(line, 80) == EOF)
+ 			exit(EX_BAD);
+ 
+ 		linep = skipwhite(line);
+@@ -178,7 +178,7 @@ again:
+ 	vprintf(form, args);
+ 	va_end(args);
+ 	flush();
+-	if (getline(okbuf, sizeof(okbuf)) == EOF)
++	if (get_line(okbuf, sizeof(okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if (okbuf[0] == '?') {
+ 		printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
+diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c
+--- cdrkit-1.1.9.orig/readom/readom.c	2007-04-03 00:43:29.000000000 +0200
++++ cdrkit-1.1.9/readom/readom.c	2009-03-11 20:31:53.000000000 +0100
+@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp,
+ 		fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
+ 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
+ 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
+-		(void) getline(filename, sizeof (filename));
++		(void) get_line(filename, sizeof (filename));
+ 	}
+ 
+ 	if (askrange) {
+@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp)
+ 		fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
+ 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
+ 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
+-		(void) getline(filename, sizeof (filename));
++		(void) get_line(filename, sizeof (filename));
+ 		fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
+ 
+ 		getlong("Enter starting sector for copy:", &addr, 0L, end-1);
+diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c
+--- cdrkit-1.1.9.orig/wodim/cue.c	2006-12-08 14:38:43.000000000 +0100
++++ cdrkit-1.1.9/wodim/cue.c	2009-03-11 20:32:18.000000000 +0100
+@@ -253,7 +253,7 @@ static	char	*skipwhite(const char *s);
+ static	char	*peekword(void);
+ static	char	*lineend(void);
+ static	char	*markword(char *delim);
+-static	char	getdelim(void);
++static	char	get_delim(void);
+ static	char	*getnextitem(char *delim);
+ static	char	*neednextitem(char *delim);
+ static	char	*nextword(void);
+@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s
+ 	if (kp == NULL)
+ 		cueabort("Unknown filetype '%s'", word);
+ 
+-	if (getdelim() == '/') {
++	if (get_delim() == '/') {
+ 		word = needitem();
+ 		if (*astol(++word, &secsize) != '\0')
+ 			cueabort("Not a number '%s'", word);
+@@ -1128,7 +1128,7 @@ linelen--;
+ }
+ 
+ static char 
+-getdelim()
++get_delim()
+ {
+ 	return (wordendc);
+ }
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch
new file mode 100644
index 0000000..5af1a37
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch
@@ -0,0 +1,15 @@
+--- cdrkit-1.1.9/include/xconfig.h.in.orig	2006-12-02 12:10:05.000000000 +0100
++++ cdrkit-1.1.9/include/xconfig.h.in	2009-03-08 13:29:05.000000000 +0100
+@@ -233,7 +233,11 @@
+ /* If using network byte order             */
+ #cmakedefine WORDS_BIGENDIAN
+ /* If high bits come first in structures   */
+-#cmakedefine BITFIELDS_HTOL
++#ifdef WORDS_BIGENDIAN
++#define BITFIELDS_HTOL
++#else
++#define BITFIELDS_LTOH
++#endif
+ #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+ #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+ 
diff --git a/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb
new file mode 100755
index 0000000..0d2dc01
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb
@@ -0,0 +1,26 @@
+DESCRIPTION="A set of tools for CD recording"
+HOMEPAGE="http://www.cdrkit.org"
+
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
+
+DEPENDS = "libcap2 bzip2"
+
+PR = "r3"
+
+SRC_URI="http://cdrkit.org/releases/cdrkit-${PV}.tar.gz \
+	 file://xconfig.patch;patch=1 \
+	 file://cdrkit-1.1.9-glibc-2.10-3.patch;patch=1 \
+	"
+
+S="${WORKDIR}/cdrkit-${PV}"
+
+inherit cmake 
+
+do_install() {
+	oe_runmake install DESTDIR="${D}"
+}
+
+RC_URI[md5sum] = "cbc0647e5d85f0e8fb3a692ba1d42edd"
+SRC_URI[sha256sum] = "d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2"
+
diff --git a/meta-openvuplus/recipes-multimedia/libcddb/libcddb_1.3.2.bb b/meta-openvuplus/recipes-multimedia/libcddb/libcddb_1.3.2.bb
new file mode 100644
index 0000000..c109205
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/libcddb/libcddb_1.3.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A library for accessing a CDDB server"
+HOMEPAGE = "http://libcddb.sourceforge.net"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6e29c688d912da12b66b73e32b03d812"
+
+PR = "r1"
+
+DEPENDS = "libcdio virtual/gettext"
+
+SRC_URI = "http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+SRC_URI[md5sum] = "8bb4a6f542197e8e9648ae597cd6bc8a"
+SRC_URI[sha256sum] = "35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
+
+inherit autotools pkgconfig
+
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
new file mode 100644
index 0000000..e7ae673
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
@@ -0,0 +1,22 @@
+MODULE = "AutoShutDown"
+DESCRIPTION = "automated power off for STB"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit gitpkgv
+SRCREV = ""
+PV = "0.3+git${SRCPV}"
+PKGV = "0.3+git${GITPKGV}"
+PR = "r2"
+
+require openplugins.inc
+
+SRC_REV = "406e54cb250fecb5040dba844098140982186668"
+SRC_URI = "git://github.com/E2OpenPlugins/e2openplugin-${MODULE}.git;protocol=git;tag=${SRC_REV} \
+	   file://autoshutdown-default-time_20121207.patch;patch=1;pnum=1 \
+	  "
+
+inherit autotools
+
+FILES_${PN} = "/"
+
+require assume-gplv2.inc
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-default-time_20121207.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-default-time_20121207.patch
new file mode 100644
index 0000000..4cfaf21
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-default-time_20121207.patch
@@ -0,0 +1,22 @@
+diff --git a/src/plugin.py b/src/plugin.py
+index 4bb7533..4f90dae 100644
+--- a/src/plugin.py
++++ b/src/plugin.py
+@@ -27,7 +27,7 @@ from __init__ import _
+ 
+ config.autoshutdown = ConfigSubsection()
+ config.autoshutdown.time = ConfigInteger(default = 120, limits = (1, 1440))
+-config.autoshutdown.inactivetime = ConfigInteger(default = 60, limits = (1, 1440))
++config.autoshutdown.inactivetime = ConfigInteger(default = 300, limits = (1, 1440))
+ config.autoshutdown.autostart = ConfigEnableDisable(default=True)
+ config.autoshutdown.enableinactivity = ConfigEnableDisable(default=True)
+ config.autoshutdown.inactivityaction = ConfigSelection(default = "standby", choices = [("standby", _("Standby")), ("deepstandby", _("Deepstandby"))])
+@@ -263,7 +263,7 @@ class AutoShutDownConfiguration(Screen, ConfigListScreen):
+ 			config.autoshutdown.time.setValue(120)
+ 			config.autoshutdown.autostart.setValue(1)
+ 			config.autoshutdown.enableinactivity.setValue(1)
+-			config.autoshutdown.inactivetime.setValue(60)
++			config.autoshutdown.inactivetime.setValue(300)
+ 			config.autoshutdown.inactivityaction.setValue("standby")
+ 			config.autoshutdown.epgrefresh.setValue(1)
+ 			config.autoshutdown.plugin.setValue(1)
diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
index 72011ab..4bee6b2 100644
--- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
+++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
@@ -13,6 +13,10 @@ DEPENDS += " \
         enigma2-plugin-extensions-openwebif \
         enigma2-plugin-extensions-remotestreamconvert \
         enigma2-plugin-extensions-addstreamurl \
+        enigma2-plugin-systemplugins-autoshutdown \
+"
+DEPENDS += " \
+	${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
 "
 
 #BAD_RECOMMENDATIONS += "libnss-mdns wpa-supplicant-passphrase"
diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
index ad0eb50..6f288a7 100644
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc
@@ -2,7 +2,7 @@ SUMMARY = "Enigma2 Task for Vuplus"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-INC_PR = "r3"
+INC_PR = "r4"
 
 inherit task
 
@@ -36,6 +36,7 @@ RDEPENDS_${PN} += " \
   python-twisted-protocols \
   python-twisted-web \
   ${@base_contains("MACHINE_FEATURES", "wifi", "task-vuplus-wlan", "", d)} \
+  ${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
   enigma2-plugin-extensions-mediaplayer \
   enigma2-plugin-extensions-pictureplayer \
   enigma2-plugin-extensions-vuplusevent \
@@ -56,6 +57,7 @@ RDEPENDS_${PN} += " \
   ${@base_contains("VUPLUS_FEATURES", "streamtv", "enigma2-plugin-extensions-streamtv", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "dlna", "enigma2-plugin-extensions-dlnaserver enigma2-plugin-extensions-dlnabrowser", "", d)} \
   ${@base_contains("VUPLUS_FEATURES", "3gmodem", "enigma2-plugin-systemplugins-3gmodemmanager", "", d)} \
+  ${@base_contains("VUPLUS_FEATURES", "autoshutdown", "enigma2-plugin-systemplugins-autoshutdown", "", d)} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb b/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb
new file mode 100644
index 0000000..2b49591
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/webmanual/vuplus-manual.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "vuplus web manual"
+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"
+
+INHIBIT_PACKAGE_STRIP = "1"
+S = "${WORKDIR}/${MACHINE}"
+
+do_compile() {
+}
+
+do_install() {
+        install -d ${D}/usr/local/manual
+        install -d ${D}/usr/local/manual/image
+	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/;
+	done
+	for f in *.jpg; do
+                install -m 0644 ${WORKDIR}/${MACHINE}/image/$f ${D}/usr/local/manual/image/;
+	done
+        for f in *.png; do
+                install -m 0644 ${WORKDIR}/${MACHINE}/image/$f ${D}/usr/local/manual/image/;
+        done
+}
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
+
+SRC_URI[md5sum] = "099122a07aa40142c0dee5fd2bbf9cc2"
+SRC_URI[sha256sum] = "8e5b4857bae757e8ef28c88a290408ed59035298510ac0242cc959678babf4c3"