Merge remote-tracking branch 'pli/master'

.gitignore

@@ -2,8 +2,10 @@
 /.deps/
 /meta-*/
 !/meta-openpli/
+!/meta-local/
 !/meta-oe-alliance/
 /openembedded-core/
 /sources/
 *.swp
 site.conf
+bblayers.conf

meta-local/conf/layer.conf

@@ -0,0 +1,7 @@
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "local-layer"
+BBFILE_PATTERN_local-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_local-layer = "100"
+

meta-local/recipes-local/images/my-image.bb

@@ -0,0 +1,19 @@
+# This recipe bakes an image close to the old MiLo-image
+# It also serves as an example of how you can arrange
+# for extra components to be preinstalled while remaining
+# compatible with the central repository.
+
+require ../../../meta-openpli/recipes-openpli/images/openpli-enigma2-image.bb
+
+IMAGE_INSTALL += "enigma2-plugin-softcams-cccam \
+	enigma2-plugin-extensions-xmltvimport \
+	enigma2-plugin-extensions-autotimer \
+	enigma2-plugin-extensions-foreca \
+	enigma2-src \
+	"
+
+# To get things in the local feed, like settings
+DEPENDS += "\
+	enigma2-plugin-settings-henksat-19e-23e-28e \
+	"
+

meta-openpli/conf/machine/include/autoload-filesystems.inc

@@ -0,0 +1 @@
+module_autoload_xfs = "xfs"

meta-openpli/conf/machine/include/dreambox-mips32el.inc

@@ -6,4 +6,4 @@ DEFAULTTUNE = "mips32el"
 require conf/machine/include/dreambox.inc
 require conf/machine/include/tune-mips32.inc
 
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r13"

meta-openpli/conf/machine/include/dreambox.inc

@@ -9,6 +9,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "dreambox-dvb-modules-${MACHINE}"
 include conf/machine/include/autoload-wifi.inc
 include conf/machine/include/autoload-dvb-usb.inc
 include conf/machine/include/autoload-usbserial.inc
+include conf/machine/include/autoload-filesystems.inc
 
 MACHINE_EXTRA_RRECOMMENDS = " \
 	gst-plugin-dreambox-dvbmediasink \

meta-openpli/conf/machine/include/etxx00.inc

@@ -9,6 +9,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
 include conf/machine/include/autoload-wifi.inc
 include conf/machine/include/autoload-dvb-usb.inc
 include conf/machine/include/autoload-usbserial.inc
+include conf/machine/include/autoload-filesystems.inc
 
 MACHINE_EXTRA_RRECOMMENDS = " \
 	gst-plugin-dvbmediasink \
@@ -25,7 +26,6 @@ GLIBC_EXTRA_OECONF = "--with-tls --with-__thread"
 PREFERRED_PROVIDER_virtual/kernel = "linux-etxx00"
 PREFERRED_PROVIDER_virtual/blindscan-dvbs = "et-blindscan-dvbs-utils"
 
-PREFERRED_VERSION_linux-etxx00 = "3.4.3"
 PREFERRED_VERSION_linux-libc-headers = "3.3"
 
 KERNEL_IMAGETYPE = "vmlinux"
@@ -55,4 +55,4 @@ MACHINE_FEATURES += "alsa usbhost wifi 3dtv switchoff textlcd osdposition hdmice
 
 require conf/machine/include/tune-mips32.inc
 
-MACHINE_KERNEL_PR = "r2"
+MACHINE_KERNEL_PR = "r3"

meta-openpli/conf/machine/include/vuxxo.inc

@@ -5,6 +5,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \
 include conf/machine/include/autoload-wifi.inc
 include conf/machine/include/autoload-dvb-usb.inc
 include conf/machine/include/autoload-usbserial.inc
+include conf/machine/include/autoload-filesystems.inc
 
 MACHINE_EXTRA_RRECOMMENDS = " \
 	vuplus-shutdown \

meta-openpli/conf/machine/include/xp.inc

@@ -9,6 +9,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "\
 include conf/machine/include/autoload-wifi.inc
 include conf/machine/include/autoload-dvb-usb.inc
 include conf/machine/include/autoload-usbserial.inc
+include conf/machine/include/autoload-filesystems.inc
 
 MACHINE_EXTRA_RRECOMMENDS = " \
 	gst-plugin-dvbmediasink \

meta-openpli/recipes-bsp/etxx00/et-dvb-modules-et4x00.bb

@@ -1,7 +1,7 @@
-KV = "3.4.3"
-SRCDATE = "20120914"
+KV = "3.6.0"
+SRCDATE = "20121017"
 
 require et-dvb-modules.inc
 
-SRC_URI[md5sum] = "6ca00409c7a95baec56eace4175dea18"
-SRC_URI[sha256sum] = "49d2293f3ce58bcf8ce00cc3cb66a0aa9859af9fa0a2b387c34111fdc8568a30"
+SRC_URI[md5sum] = "cb04a9043fcf6e081320d077ce0a23c5"
+SRC_URI[sha256sum] = "be287bd9a9235d56b377bfca045d4ffc3866e0914456b69ce054a1423d73b0a0"

meta-openpli/recipes-bsp/etxx00/et-dvb-modules-et5x00.bb

@@ -1,9 +1,9 @@
-KV = "3.4.3"
-SRCDATE = "20120714"
+KV = "3.6.0"
+SRCDATE = "20121017"
 
 RDEPENDS_${PN} += "et-fpupdate-${MACHINE}"
 
 require et-dvb-modules.inc
 
-SRC_URI[md5sum] = "b59841fdcecc93f59ec98da7ba2f434b"
-SRC_URI[sha256sum] = "f37a8067c0c69e0efd8f993f6ec15bf1c5b038a33f3119872d6d437891b8329f"
+SRC_URI[md5sum] = "7800d54ad9d930501baec006f94f2fd8"
+SRC_URI[sha256sum] = "9081bca43d7e68b6be4e9ec3b3b1576d3f2ceffbb04f92e748727be46b6d1930"

meta-openpli/recipes-bsp/etxx00/et-dvb-modules-et6x00.bb

@@ -1,9 +1,9 @@
-KV = "3.4.3"
-SRCDATE = "20120714"
+KV = "3.6.0"
+SRCDATE = "20121017"
 
 RDEPENDS_${PN} += "et-fpupdate-${MACHINE}"
 
 require et-dvb-modules.inc
 
-SRC_URI[md5sum] = "c6875891e677750b730d6eab2633dc73"
-SRC_URI[sha256sum] = "263eb4757d07ca9c35a0dcfa47fb98e26e718f65b5a08ea1a57c6ddfacf09262"
+SRC_URI[md5sum] = "622d5034e8650db2751b469826f7b3c1"
+SRC_URI[sha256sum] = "051a93ce27a3a573114982180b84ecfca2d5129808b94dbe873da2790e58031b"

meta-openpli/recipes-bsp/etxx00/et-dvb-modules-et9x00.bb

@@ -1,9 +1,9 @@
-KV = "3.4.3"
-SRCDATE = "20120714"
+KV = "3.6.0"
+SRCDATE = "20121017"
 
 RDEPENDS_${PN} += "et-fpupdate-${MACHINE}"
 
 require et-dvb-modules.inc
 
-SRC_URI[md5sum] = "278e62da9a6944056afaa3565918285c"
-SRC_URI[sha256sum] = "17bbee7617f213586211ba56b3975eda20ae5adfc40d036b64ee06efd551eeca"
+SRC_URI[md5sum] = "ae460f5462b13c0904eddd72613121aa"
+SRC_URI[sha256sum] = "0ef0950622147745cad2c2b986bf88acec0ac3cdfe32159d4e1a985c608262d8"

meta-openpli/recipes-core/busybox/busybox-1.19.4/mdev-mount.sh

@@ -10,11 +10,6 @@ notify() {
 case "$ACTION" in
 	add|"")
 		ACTION="add"
-		# Run the result of blkid as a shell command
-		eval `blkid /dev/${MDEV} | grep ${MDEV} | cut -d ':' -f 2`
-		if [ -z "$TYPE" ] ; then
-			exit 0
-		fi
 		# check if already mounted
 		if grep -q "^/dev/${MDEV} " /proc/mounts ; then
 			# Already mounted
@@ -26,6 +21,12 @@ case "$ACTION" in
 			# blocked
 			exit 0
 		fi
+		# Run the result of blkid as a shell command
+		eval `blkid /dev/${MDEV} | grep ${MDEV} | cut -d ':' -f 2`
+		if [ -z "$TYPE" ] ; then
+			notify
+			exit 0
+		fi
 		if [ $TYPE == swap ] ; then
 			if ! grep -q "^/dev/${MDEV} " /proc/swaps ; then
 				swapon /dev/${MDEV}

meta-openpli/recipes-core/busybox/busybox_1.19.4.bbappend

@@ -1,4 +1,4 @@
-PRINC = "21"
+PRINC = "22"
 
 SRC_URI += " \
 			file://0001-ifupdown-support-post-up-pre-down-hooks.patch \