backport dm500hd support

4 files changed, 31 insertions, 9 deletions

diff --git a/packages/dreambox/dreambox-bootlogo.bb b/packages/dreambox/dreambox-bootlogo.bb
index 90a7f2752b..c8cc8f6c47 100644
--- a/packages/dreambox/dreambox-bootlogo.bb
+++ b/packages/dreambox/dreambox-bootlogo.bb
@@ -23,10 +23,14 @@ SRC_URI_append_dm8000 = " http://sources.dreamboxupdate.com/download/7020/bootlo
 SRC_URI_append_dm800 = " http://sources.dreamboxupdate.com/download/7020/bootlogo-${MACHINE}-${IMAGES_VERSION}.jpg \
 	http://sources.dreamboxupdate.com/download/7020/switchoff-${MACHINE}-${IMAGES_VERSION}.mvi"
 
+SRC_URI_append_dm500hd = " http://sources.dreamboxupdate.com/download/7020/bootlogo-${MACHINE}-${IMAGES_VERSION}.jpg \
+	http://sources.dreamboxupdate.com/download/7020/switchoff-${MACHINE}-${IMAGES_VERSION}.mvi"
+
 S = "${WORKDIR}/"
 
 MVI = "bootlogo backdrop bootlogo_wait"
 MVI_append_dm800 = " switchoff"
+MVI_append_dm500hd = " switchoff"
 
 do_install() {
 	install -d ${D}/boot
@@ -51,6 +55,10 @@ do_install_dm8000() {
 	do_install_dm800
 }
 
+do_install_dm500hd() {
+	do_install_dm800
+}
+
 pkg_preinst() {
 	[ -d /proc/stb ] && mount -o rw,remount /boot
 }
diff --git a/packages/dreambox/dreambox-dvb-modules.bb b/packages/dreambox/dreambox-dvb-modules.bb
index 8e7664d0e9..8f66348ae5 100644
--- a/packages/dreambox/dreambox-dvb-modules.bb
+++ b/packages/dreambox/dreambox-dvb-modules.bb
@@ -26,6 +26,9 @@ PV_dm500plus = "${KV}-20080822"
 KV_dm800 = "2.6.12-5.1-brcmstb-dm800"
 PV_dm800 = "${KV}-20090707"
 
+KV_dm500hd = "2.6.12-5.1-brcmstb-dm500hd"
+PV_dm500hd = "${KV}-20090521"
+
 KV_dm8000 = "2.6.12-5.1-brcmstb-dm8000"
 PV_dm8000 = "${KV}-20090707"
 
@@ -52,6 +55,13 @@ do_install_dm800() {
 	done
 }
 
+do_install_dm500hd() {
+	install -d ${D}/lib/modules/${KV}/extra
+	for f in *.ko LICENSE; do
+		install -m 0644 ${WORKDIR}/$f ${D}/lib/modules/${KV}/extra/$f;
+	done
+}
+
 do_install_dm7025() {
 	do_install_dm800
 	install -d ${D}${sbindir}
diff --git a/packages/dreambox/dreambox-dvbincludes.bb b/packages/dreambox/dreambox-dvbincludes.bb
index 6438110369..3e07e1a168 100644
--- a/packages/dreambox/dreambox-dvbincludes.bb
+++ b/packages/dreambox/dreambox-dvbincludes.bb
@@ -84,12 +84,6 @@ do_install_dm800() {
 	done;
 }
 
-do_install_dm8000() {
-	install -d ${STAGING_INCDIR}/ci
-	install -d ${STAGING_INCDIR}/dbox
-	install -d ${STAGING_INCDIR}/dreambox
-	install -d ${STAGING_INCDIR}/tuxbox
-	for f in ${INPUT_FILES}; do
-		install -m 0644 ${S}/$f ${STAGING_INCDIR}/$f
-	done;
+do_install_dm500hd() {
+	do_install_dm800
 }
diff --git a/packages/dreambox/dreambox-secondstage.bb b/packages/dreambox/dreambox-secondstage.bb
index 90ceec89c4..2420ba86a2 100644
--- a/packages/dreambox/dreambox-secondstage.bb
+++ b/packages/dreambox/dreambox-secondstage.bb
@@ -8,6 +8,7 @@ PV_dm600pvr = "66"
 PV_dm500plus = "66"
 PV_dm8000 = "73"
 PV_dm800 = "73"
+PV_dm500hd = "70"
 PR = "r0"
 
 RDEPENDS_dm8000 = "dreambox-bootlogo (>=5.1-r3)"
@@ -19,6 +20,7 @@ SECONDSTAGE_UPDATE_SRC = "http://sources.dreamboxupdate.com/download/7020/second
 
 SRC_URI_append_dm8000 = " ${SECONDSTAGE_UPDATE_SRC}"
 SRC_URI_append_dm800 = " ${SECONDSTAGE_UPDATE_SRC}"
+#SRC_URI_append_dm500hd = " ${SECONDSTAGE_UPDATE_SRC}"
 
 S = "${WORKDIR}"
 
@@ -27,7 +29,7 @@ do_stage() {
 	gzip -c ${S}/secondstage-${MACHINE}-${PV}.bin > ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz
 }
 
-# the dm{800,8000} secondstage is already compressed (and encrypted)
+# the dm{800,8000,500hd} secondstage is already compressed (and encrypted)
 
 do_stage_dm8000() {
 	install -d ${STAGING_LIBDIR}/dreambox-secondstage
@@ -48,6 +50,14 @@ do_install_dm800() {
 	do_install_dm8000
 }
 
+do_stage_dm500hd() {
+	do_stage_dm8000
+}
+
+#do_install_dm500hd() {
+#	do_install_dm8000
+#}
+
 FILES_${PN} = "/tmp"
 PACKAGE_ARCH := "${MACHINE_ARCH}"