Merge remote-tracking branch 'origin/master' into obi

diff --git a/.gitignore b/.gitignore
index 47a8ef8..13a193a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 !/meta-bsp/
 !/meta-openvuplus/
 /openembedded-core/
-/sources/
+/resource/
 *.swp
 bblayers.conf
 /tmp/

diff --git a/Makefile b/Makefile
index c2c02b5..69da111 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ XSUM ?= md5sum
 
 BUILD_DIR = $(CURDIR)/build
 TOPDIR = $(BUILD_DIR)/$(MACHINE)
-DL_DIR = $(CURDIR)/sources
+DL_DIR = $(CURDIR)/resource/sources
 
 ifeq ($(MULTI_TEMPORARILY), YES)
 SSTATE_DIR = $(TOPDIR)/sstate-cache
@@ -63,7 +63,7 @@ BBLAYERS ?= \
        $(CURDIR)/openembedded-core/meta
 
 CONFFILES = \
-       bitbake.env \
+       $(TOPDIR)/bitbake.env \
        $(TOPDIR)/conf/bblayers.conf \
        $(TOPDIR)/conf/local.conf
 
@@ -108,8 +108,8 @@ help:
        @echo "      $$ $(MAKE) download"
        @echo
        @echo "  * Set up the environment to build recipes manually:"
+       @echo "      $$ cd $(BUILD_DIR)"
        @echo "      $$ source bitbake.env"
-       @echo "      $$ cd build/$(MACHINE)"
        @echo "      $$ bitbake <target>"
        @echo "    [Replace <target> with a recipe name, e.g. vuplus-image or enigma2]"
        @echo
@@ -146,11 +146,11 @@ distclean: clean
 
 image: init
        @echo '[*] Building image for $(MACHINE)'
-       @. $(CURDIR)/bitbake.env && cd $(TOPDIR) && bitbake vuplus-image
+       @. $(TOPDIR)/bitbake.env && cd $(TOPDIR) && bitbake vuplus-image
 
 download: init
        @echo '[*] Downloading sources'
-       @. $(CURDIR)/bitbake.env && cd $(TOPDIR) && bitbake -cfetchall -k vuplus-image
+       @. $(TOPDIR)/bitbake.env && cd $(TOPDIR) && bitbake -cfetchall -k vuplus-image
 
 update:
        @echo '[*] Updating Git repositories...'
@@ -177,8 +177,9 @@ BITBAKE_ENV_HASH := $(call hash, \
        'CURDIR = "$(CURDIR)"' \
        )
 
-bitbake.env: $(DEPDIR)/.bitbake.env.$(BITBAKE_ENV_HASH)
+$(TOPDIR)/bitbake.env: $(DEPDIR)/.bitbake.env.$(BITBAKE_ENV_HASH)
        @echo '[*] Generating $@'
+       @test -d $(@D) || mkdir -p $(@D)
        @echo '# Automatically generated file. Do not edit!' > $@
        @echo 'export PATH=$(CURDIR)/openembedded-core/scripts:$(CURDIR)/bitbake/bin:$${PATH}' >> $@
 
@@ -215,6 +216,7 @@ $(TOPDIR)/conf/local.conf: $(DEPDIR)/.local.conf.$(MACHINE).$(LOCAL_CONF_HASH)
        @echo 'USER_CLASSES = "buildstats"' >> $@
        @echo 'include $(DISTRO_INCLUDE_CONF)' >> $@
        @echo 'include $(MACHINE_INCLUDE_CONF)' >> $@
+#      @echo 'INHERIT+="rm_work"' >> $@
 
 BBLAYERS_CONF_HASH := $(call hash, \
        'BBLAYERS_CONF_VERSION = "0"' \

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index f94f205..542cabd 100644 (file)
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -5,6 +5,13 @@
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_simple"
 
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+
+
 IMAGE_UNPACK_PATH = "vuplus/duo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
 

diff --git a/meta-bsp/bm750/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/bm750/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..ae96ac7
--- /dev/null
+++ b/meta-bsp/bm750/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,5 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "5bf4975a46f7af78994534d1629ddc7a"
+SRC_URI[sha256sum] = "ad7e79b424968e382e29b8f5fe97e4164922771624f30c2b2fa5d8ed198c400f"
+

diff --git a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
index 386ae61..7f2a34c 100644 (file)
--- a/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/bm750/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -2,6 +2,5 @@ SRCDATE = "20121025"
 
 MODULES_NAME = "procmk\ndvb-bcm7335\nbrcmfb"
 
-SRC_URI[md5sum] = "2d117a6e5b1ade6fa93ae80218fee23c"
-SRC_URI[sha256sum] = "601d82fc6cc426f2e600dd2fd3d2ee7375e451fea51f1332fbee10cf9fd186a4"
-
+SRC_URI[md5sum] = "f394b34eea94e186593dfab2217568a6"
+SRC_URI[sha256sum] = "7c8d2abef5ccf172ea88e428c05e88e8cf8a31bb2ecdee87ef1b5739275b4160"

diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index c57f381..2c9c0ae 100644 (file)
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -6,6 +6,14 @@ MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "webif"
+
 IMAGE_UNPACK_PATH = "vuplus/duo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
 

diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..abe948f
--- /dev/null
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,4 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "2c09f9bc696c3cc0fefb718ddfb71ab1"
+SRC_URI[sha256sum] = "47f7f3bbd8b35fd6ab03968c066e6b1c7945195f5f659925681ece4b30cd4e70"

diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf
index 159106b..3151690 100644 (file)
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -3,6 +3,10 @@
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 
 VUPLUS_FEATURES = ""
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
 
 IMAGE_UNPACK_PATH = "vuplus/solo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-bsp/vusolo/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vusolo/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..8d56472
--- /dev/null
+++ b/meta-bsp/vusolo/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,4 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "5bf4975a46f7af78994534d1629ddc7a"
+SRC_URI[sha256sum] = "ad7e79b424968e382e29b8f5fe97e4164922771624f30c2b2fa5d8ed198c400f"

diff --git a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
index f0f056c..cee1861 100644 (file)
--- a/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vusolo/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -2,6 +2,5 @@ SRCDATE = "20121025"
 
 MODULES_NAME = "procmk\ndvb-bcm7325\nbrcmfb"
 
-SRC_URI[md5sum] = "5b9f02dfdb4dfc9979287aa1e1e794c2"
-SRC_URI[sha256sum] = "32ec3859b9f47af03a26451dadb84fb30ef5c973ce291e79419b6ef13c37eb46"
-
+RC_URI[md5sum] = "a7b76cc1e6804073c41bfeeb37d99e87"
+SRC_URI[sha256sum] = "a464d388996a43791e745572221787a3ccfaf27f0d0e220b930ecb718d584c17"

diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
index e9997ec..7bdf989 100644 (file)
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -6,6 +6,14 @@ MACHINE_FEATURES += "display-text-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "webif"
+
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
 

diff --git a/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..1786d2e
--- /dev/null
+++ b/meta-bsp/vusolo2/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,5 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "2c09f9bc696c3cc0fefb718ddfb71ab1"
+SRC_URI[sha256sum] = "47f7f3bbd8b35fd6ab03968c066e6b1c7945195f5f659925681ece4b30cd4e70"
+

diff --git a/meta-bsp/vuultimo/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vuultimo/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..1786d2e
--- /dev/null
+++ b/meta-bsp/vuultimo/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,5 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "2c09f9bc696c3cc0fefb718ddfb71ab1"
+SRC_URI[sha256sum] = "47f7f3bbd8b35fd6ab03968c066e6b1c7945195f5f659925681ece4b30cd4e70"
+

diff --git a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
index 476804a..a6949c8 100644 (file)
--- a/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuultimo/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -2,5 +2,5 @@ SRCDATE = "20121025"
 
 MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "319c12d52558510265d71d1223d34d51"
-SRC_URI[sha256sum] = "995a780608f47d9f5fcd304ec96482eaa3dfa189830ec3bf6a96d9d44e12911a"
+SRC_URI[md5sum] = "351c146f1b6b0d4a0ae68bb4ee590220"
+SRC_URI[sha256sum] = "984dbd17161257c9fab6de07c3712463dd504ed34f3fc3bfbb5c3b5cdba356ca"

diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index f6ba558..ba669e7 100644 (file)
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -5,6 +5,13 @@
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_manual rc_code"
 
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "fpgaupgrade"
+
 IMAGE_UNPACK_PATH = "vuplus/uno"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
 

diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-blindscan-utils.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-blindscan-utils.bbappend
new file mode 100644 (file)
index 0000000..8c162a4
--- /dev/null
+++ b/meta-bsp/vuuno/recipes/vuplus/vuplus-blindscan-utils.bbappend
@@ -0,0 +1,5 @@
+PR .= "vuplus0"
+
+SRC_URI[md5sum] = "00028ba3e06426ac851e861aa2416fb6"
+SRC_URI[sha256sum] = "3b8f6b02d596f7d470ba5f3e4365ce10b8d7a740d7754e6a31c2f0d09042a4a8"
+

diff --git a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
index 43cdf02..2cc152d 100644 (file)
--- a/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuuno/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -2,5 +2,5 @@ SRCDATE = "20121025"
 
 MODULES_NAME = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "928cf5cbe30af32ade7bbc8b7fb97852"
-SRC_URI[sha256sum] = "06bb2b37c48e46fa2ff406417340bf2ab1e86e5bcd5886e8b52d952f976e5e55"
+SRC_URI[md5sum] = "b47fcb552cedd4cc11c5093b0a291cef"
+SRC_URI[sha256sum] = "e57e544b12beccec5a2c9fba3b36c52f2876a4cd43be5da39fd2f4a3fc39b9c1"

diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
index 860957b..49f8d86 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b1a795ac1a06805cf8fd74920bc46b5c"
 DEPENDS = "libexif jpeg libid3tag flac libvorbis sqlite3 libav util-linux"
 SRCDATE = "20120408"
 PV = "1.0.99+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "cvs://anonymous@minidlna.cvs.sourceforge.net/cvsroot/minidlna;module=minidlna \
                file://default_sqlite_caches.diff \
                file://minidlna.conf \
-               file://init"
+"
 
 S = "${WORKDIR}/${PN}"
 

diff --git a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
index f5f7c1a..7fc1160 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
+++ b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r8"
+PR = "r9"
 
 inherit task
 
@@ -24,7 +24,7 @@ WIFI_FIRMWARES = "\
 
 RALINK_MODULE = "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'rt3070', 'kernel-module-rt2800usb rt2870sta firmware-rt3070', d)}"
 
-REALTEK_MODULE = "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'r8192cu', 'kernel-module-rtl8192cu', d)}"
+REALTEK_MODULE = "r8192cu"
 
 KERNEL_WIFI_MODULES = " \
        kernel-module-ath9k-htc \
@@ -33,7 +33,6 @@ KERNEL_WIFI_MODULES = " \
        kernel-module-rt73usb \
        kernel-module-rt2500usb \
        kernel-module-r8192u-usb \
-       kernel-module-rtl8192cu \
        kernel-module-rtl8187 \
        kernel-module-r8712u \
        kernel-module-w35und \

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb
index 451c7a1..f224870 100755 (executable)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb
@@ -1,6 +1,7 @@
 SUMMARY = "Skins for Enigma2"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-LICENSE = "CLOSED"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://README;startline=1;endline=6;md5=d41d8cd98f00b204e9800998ecf8427e"
 
 PACKAGES_DYNAMIC = "enigma2-skin-*"
 
@@ -9,7 +10,7 @@ SRCREV="de610a460bec046f0dca9987ecba458303daaf1d"
 SRCDATE="20110128"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI="git://schwerkraft.elitedvb.net/enigma2-skins/enigma2-skins.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 

diff --git a/sources b/sources
deleted file mode 120000 (symlink)
index 4617085..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-/opt/hdd2/projects/openpli-oe-core/sources/
\ No newline at end of file