[oe-commits] ghost : add possibility to update the secondstage loader via ipk

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 8c1f0de2d6db543ee3da7ab9f2207ebfb849c425
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8c1f0de2d6db543ee3da7ab9f2207ebfb849c425

Author: ghost <andreas.monzner at multimedia-labs.de>
Date:   Wed Nov 12 20:02:27 2008 +0100

add possibility to update the secondstage loader via ipk

---

 conf/machine/dm8000.conf                  |    3 ++-
 packages/dreambox/dreambox-secondstage.bb |   22 ++++++++++++++++++++--
 packages/images/dreambox-image.bb         |    3 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/conf/machine/dm8000.conf b/conf/machine/dm8000.conf
index b873055..874d77f 100644
--- a/conf/machine/dm8000.conf
+++ b/conf/machine/dm8000.conf
@@ -42,7 +42,8 @@ EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
        ${EXTRA_IMAGECMD}; rm -rf ${IMAGE_ROOTFS}/boot/*; \
-				mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+       rm -rf ${IMAGE_ROOTFS}/tmp/*; \
+       mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
        --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
        ${EXTRA_IMAGECMD}; \
        buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
diff --git a/packages/dreambox/dreambox-secondstage.bb b/packages/dreambox/dreambox-secondstage.bb
index efb7739..320e2db 100644
--- a/packages/dreambox/dreambox-secondstage.bb
+++ b/packages/dreambox/dreambox-secondstage.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dreambox DM702x second stage bootloader"
+DESCRIPTION = "Dreambox second stage bootloader"
 SECTION = "base"
 PRIORITY = "required"
 MAINTAINER = "Felix Domke <tmbinc at elitedvb.net>"
@@ -6,11 +6,13 @@ PV_dm7020 = "35"
 PV_dm7025 = "61"
 PV_dm600pvr = "66"
 PV_dm500plus = "66"
-PV_dm8000 = "68"
+PV_dm8000 = "69"
 PV_dm800 = "67"
 PR = "r0"
 
 SRC_URI = "http://sources.dreamboxupdate.com/download/7020/secondstage-${MACHINE}-${PV}.bin"
+SRC_URI_append_dm8000 = " http://sources.dreamboxupdate.com/download/7020/secondstage-${MACHINE}-${PV}.nfi \
+	http://sources.dreamboxupdate.com/download/7020/writenfi-${MACHINE}-r0"
 
 S = "${WORKDIR}"
 
@@ -29,3 +31,19 @@ do_stage_dm8000() {
 	install -d ${STAGING_LIBDIR}/dreambox-secondstage
 	cp ${S}/secondstage-${MACHINE}-${PV}.bin ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz
 }
+
+do_install_dm8000() {
+	install -d ${D}/tmp
+	install ${WORKDIR}/secondstage-${MACHINE}-${PV}.nfi ${D}/tmp/secondstage.nfi
+	install -m 0755 ${WORKDIR}/writenfi-${MACHINE}-r0 ${D}/tmp/writenfi
+}
+
+FILES_${PN}_dm8000 = "/tmp"
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+
+pkg_postinst_dm8000() {
+	if [ -d /proc/stb ]; then
+		/tmp/writenfi /tmp/secondstage.nfi;
+		rm /tmp/writenfi /tmp/secondstage.nfi;
+	fi
+}
diff --git a/packages/images/dreambox-image.bb b/packages/images/dreambox-image.bb
index f8c52fa..9eb7027 100644
--- a/packages/images/dreambox-image.bb
+++ b/packages/images/dreambox-image.bb
@@ -129,7 +129,8 @@ OPENDREAMBOX_COMMON_MACHINE_dm8000 += "${OPENDREAMBOX_V3_ONLY} ${OPENDREAMBOX_EX
 OPENDREAMBOX_COMMON_MACHINE_R_dm8000 += "${OPENDREAMBOX_EXPERIMENTAL_R} \
 	${WLAN_SUPPORT_R} ${WLAN_MADWIFI_R} ${DVDPLAYER_SUPPORT_R} \
 	${DVDBURN_SUPPORT_R}  enigma2-plugin-systemplugins-videomode \
-	${CDPLAYER_SUPPORT_R}"
+	${CDPLAYER_SUPPORT_R} \
+	dreambox-secondstage"
 OPENDREAMBOX_COMMON_MACHINE_D_dm8000 += ""
 
 # collect the stuff into OPENDREAMBOX_COMMON