pandora-tasks: Rearranged so that opkg shouldn't go crazy.

[openpandora.oe.git] / recipes / images / pandora-xfce-image.bb

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index e80079c..d669a5f 100755 (executable)
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -6,7 +6,7 @@ IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
 inherit image
 
-PR = "r23"
+PR = "r30"
 
 export IMAGE_BASENAME = "pandora-xfce-image"
 
@@ -17,6 +17,10 @@ DEPENDS = "task-base"
 IMAGE_INSTALL += " \
     task-pandora-core \
     task-pandora-xfce \
+    pandora-scripts-wifi \
+    pandora-configtray-wifi \
+    pandora-firmware \
+    wl1251-modules \
     ${SPLASH} \        
 "
 
@@ -27,7 +31,7 @@ PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo GIT-VERSION: `git log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "echo Version: 1.8.0.1 - R1.51 Codename Super Zaxxon, Final >> ${PANDORA_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Version: 1.8.0.5 - R1.54 Codename Super Zaxxon >> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};"
@@ -38,6 +42,5 @@ ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a S0:2345:once:/sbin/getty 115200 tty
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a O2:2345:once:/sbin/getty 115200 ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS2/a ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/securetty;"
 
-# temporary hack for new kernel test
-ROOTFS_POSTPROCESS_COMMAND += "if [ -e ${HOME}/oe_rootfs_extra.tar.bz2 ]; then tar -C ${IMAGE_ROOTFS}/ -xvf ${HOME}/oe_rootfs_extra.tar.bz2; fi;"
+# call a script to generate flashes tools automatically
 ROOTFS_POSTPROCESS_COMMAND += "if [ -e ${HOME}/oe_make_bootf/do.sh ]; then ${HOME}/oe_make_bootf/do.sh ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}; fi;"