X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fimages%2Fvuplus-image.inc;h=b88db556da733eecda0429d280913c13d6de7ee1;hp=4bee6b2730cd1217ca1b868b3f0962c73e042108;hb=62c6cf38a4fc3b98419de1d11e50320c2acfd453;hpb=4977da0f186cc715b071e9c37e70f2dee241d06c

diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
index 4bee6b2..b88db55 100644
--- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
+++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
@@ -1,12 +1,12 @@
 SUMMARY = "A Vuplus firmware image"
 
 # packages to build for the feed
-#DEPENDS = " \
-#	gdb \
-#	lsof \
-#	ltrace \
-#	strace \
-#"
+DEPENDS = " \
+	gdb \
+	lsof \
+	ltrace \
+	strace \
+"
 
 # build e2openplugins
 DEPENDS += " \
@@ -18,33 +18,25 @@ DEPENDS += " \
 DEPENDS += " \
 	${@base_contains("VUPLUS_FEATURES", "webmanual", "vuplus-manual", "", d)} \
 "
+DEPENDS += " \
+	${@base_contains("VUPLUS_FEATURES", "xbmc", "enigma2-plugin-extensions-xbmc", "", d)} \
+"
 
 #BAD_RECOMMENDATIONS += "libnss-mdns wpa-supplicant-passphrase"
 BAD_RECOMMENDATIONS += "libnss-mdns"
 
-TASK_CORE_BOOT ?= "task-core-boot"
-TASK_VUPLUS_BASE ?= "task-vuplus-base"
-TASK_VUPLUS_ENIGMA ?= "task-vuplus-enigma2"
-TASK_ESSENCIAL ?= "task-vuplus-essential"
-
-# packages to drag into the image
-#IMAGE_INSTALL = " \
-#	${TASK_CORE_BOOT} ${ROOTFS_PKGMANAGE} \
-#	${TASK_VUPLUS_BASE} \
-#	${TASK_VUPLUS_DVBAPI} \
-#	${TASK_VUPLUS_ENIGMA} \
-#"
+PACKAGEGROUP_CORE_BOOT ?= "packagegroup-core-boot"
+PACKAGEGROUP_VUPLUS_BASE ?= "packagegroup-vuplus-base"
+PACKAGEGROUP_VUPLUS_ENIGMA ?= "packagegroup-vuplus-enigma2"
+PACKAGEGROUP_ESSENCIAL ?= "packagegroup-vuplus-essential"
 
 IMAGE_INSTALL = " \
-	${ROOTFS_PKGMANAGE} \
-	${TASK_CORE_BOOT} \
-	${TASK_VUPLUS_BASE} \
-	${TASK_VUPLUS_ENIGMA} \
-	${TASK_ESSENCIAL} \
+	${PACKAGEGROUP_CORE_BOOT} ${ROOTFS_PKGMANAGE} \
+	${PACKAGEGROUP_VUPLUS_BASE} \
+	${PACKAGEGROUP_VUPLUS_ENIGMA} \
+	${PACKAGEGROUP_ESSENCIAL} \
 "
 
-IMAGE_PKGTYPE = "ipk"
-
 # enable online package management
 IMAGE_FEATURES += "package-management"
 
@@ -54,47 +46,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
-}