X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Fimages%2Fpandora-xfce-image.bb;h=87890c613027ce543ac9ef1d3b917012ea9b7b4d;hb=04f4130f3b8dae9c5d7dc0d5d0155d6ae23a51d0;hp=151d1b3bb0afc88965046ca68765d5658d0553b0;hpb=bbe3505488ec29c984eb1f7affb0e6ea34820746;p=openpandora.oe.git

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 151d1b3..87890c6 100755
--- 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 = "r22"
+PR = "r32"
 
 export IMAGE_BASENAME = "pandora-xfce-image"
 
@@ -22,15 +22,7 @@ IMAGE_INSTALL += " \
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
-# Helper to say what image we built, include GIT tag and image name.
-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.0 - R1.5 Codename Super Zaxxon, Final >> ${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};"
+# reminder: /etc/op-version is now made by recipes/pandora-system/pandora-version.bb
 
 # HACK for different serial ports used by different kernels
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
@@ -38,6 +30,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;"