fix vuplus-image

2 files changed, 5 insertions, 47 deletions

diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.bb b/meta-openvuplus/recipes-vuplus/images/vuplus-image.bb
index c996728..2710401 100644
--- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.bb
+++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.bb
@@ -1,3 +1,5 @@
+IMAGE_PKGTYPE = "ipk"
+
 require vuplus-image.inc
 
 do_rootfs_append() {
diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
index f09e3d9..8a7ea86 100644
--- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
+++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
@@ -28,14 +28,6 @@ TASK_VUPLUS_ENIGMA ?= "task-vuplus-enigma2"
 TASK_ESSENCIAL ?= "task-vuplus-essential"
 TASK_VUPLUS_DVBAPI ?= "task-vuplus-dvbapi"
 
-# packages to drag into the image
-#IMAGE_INSTALL = " \
-#	${TASK_CORE_BOOT} ${ROOTFS_PKGMANAGE} \
-#	${TASK_VUPLUS_BASE} \
-#	${TASK_VUPLUS_DVBAPI} \
-#	${TASK_VUPLUS_ENIGMA} \
-#"
-
 IMAGE_INSTALL = " \
 	${TASK_CORE_BOOT} ${ROOTFS_PKGMANAGE} \
 	${TASK_VUPLUS_BASE} \
@@ -44,8 +36,6 @@ IMAGE_INSTALL = " \
 	${TASK_ESSENCIAL} \
 "
 
-IMAGE_PKGTYPE = "ipk"
-
 # enable online package management
 IMAGE_FEATURES += "package-management"
 
@@ -55,47 +45,13 @@ IMAGE_LINGUAS = ""
 inherit image
 
 vuplus_rootfs_postprocess() {
-    curdir=$PWD
-    cd ${IMAGE_ROOTFS}
-
     # generate /etc/image-version
-    IMAGE_VERSION="000"
     IMAGE_DATE=`date +%Y%m%d%H%M`
+    # 0: Release, 1: Experimental
     IMAGE_TYPE="1"
+    # e.g. 400 for release 4.0.0, if IMAGE_TYPE=0
+    IMAGE_VERSION="000"
     echo "version=${IMAGE_TYPE}${IMAGE_VERSION}${IMAGE_DATE}" > ${IMAGE_ROOTFS}/etc/image-version
-    echo "comment=${DISTRO_NAME}" >> ${IMAGE_ROOTFS}/etc/image-version
-    echo "target=9" >> ${IMAGE_ROOTFS}/etc/image-version
-    echo "creator=OpenEmbedded <oe@vuplus.com>" >> ${IMAGE_ROOTFS}/etc/image-version
-    echo "url=http://www.vuplus.com/" >> ${IMAGE_ROOTFS}/etc/image-version
-    echo "catalog=http://www.vuplus.com/" >> ${IMAGE_ROOTFS}/etc/image-version
-
-    # because we're so used to it
-    ln -s opkg usr/bin/ipkg || true
-    ln -s opkg-cl usr/bin/ipkg-cl || true
-
-    cd $curdir
 }
 
 ROOTFS_POSTPROCESS_COMMAND += "vuplus_rootfs_postprocess; "
-
-export NFO = '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfo'
-
-generate_nfo() {
-    VER=`grep Version: "${IMAGE_ROOTFS}/usr/lib/ipkg/info/enigma2.control" | cut -b 10-26`
-    echo "DvbApp2: ${VER}" > ${NFO}
-    echo "Machine: Vuplus ${MACHINE}" >> ${NFO}
-    DATE=`date +%Y-%m-%d' '%H':'%M`
-    echo "Date: ${DATE}" >> ${NFO}
-    echo "Issuer: Vuplus" >> ${NFO}
-    echo "Link: ${DISTRO_FEED_URI}" >> ${NFO}
-    if [ "${DESC}" != "" ]; then
-        echo "Description: ${DESC}" >> ${NFO}
-        echo "${DESC}" >> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.desc
-    fi
-    MD5SUM=`md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.nfi | cut -b 1-32`
-    echo "MD5: ${MD5SUM}" >> ${NFO}
-}
-
-do_rootfs_append() {
-    generate_nfo
-}