add pandora-version to generate op-version

by popular request

diff --git a/recipes/images/pandora-xfce-image-nowifi.bb b/recipes/images/pandora-xfce-image-nowifi.bb
index 85d6fea..9aeca37 100755 (executable)
--- a/recipes/images/pandora-xfce-image-nowifi.bb
+++ b/recipes/images/pandora-xfce-image-nowifi.bb
@@ -22,15 +22,7 @@ IMAGE_INSTALL += " \
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 
 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.5 - R1.54 JAP 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};"
+# 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;"
 
 # HACK for different serial ports used by different kernels
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 077ccb8..87890c6 100755 (executable)
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -22,15 +22,7 @@ IMAGE_INSTALL += " \
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 
 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.6 - R1.55 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};"
+# 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;"
 
 # HACK for different serial ports used by different kernels
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"

diff --git a/recipes/pandora-system/pandora-version.bb b/recipes/pandora-system/pandora-version.bb
new file mode 100644 (file)
index 0000000..99d2fdf
--- /dev/null
+++ b/recipes/pandora-system/pandora-version.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Installs /etc/op-version file."
+LICENSE = "Public Domain"
+PR = "r0"
+
+do_install() {
+  OLD_PWD=$PWD
+  opvf=${D}/${sysconfdir}/op-version
+  cd `dirname "${FILE_DIRNAME}"`
+  install -d ${D}${sysconfdir}/
+  echo "Tag Name: `git describe`" > ${opvf}
+  echo "GIT-VERSION: `git log -n1 --pretty=oneline|awk '{print $1}'`" >> ${opvf}
+  echo "Branch: `git branch | awk '/*/{print $2}'`" >> ${opvf}
+  echo "Version: 1.8.0.6 - R1.55 Codename Super Zaxxon" >> ${opvf}
+  echo "Image Builder: ${LOGNAME}@`cat /etc/hostname`" >> ${opvf}
+  echo "Time Stamp: `date -R`" >> ${opvf}
+}
+
+FILES_${PN} += "${sysconfdir}/op-version"
+
+COMPATIBLE_MACHINE = "omap3-pandora"

diff --git a/recipes/tasks/task-pandora-xfce.inc b/recipes/tasks/task-pandora-xfce.inc
index bbd4ece..9026019 100755 (executable)
--- a/recipes/tasks/task-pandora-xfce.inc
+++ b/recipes/tasks/task-pandora-xfce.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
 
 # Don't forget to bump the PR if you change it.
 

-PR = "r78"
+PR = "r79"

 
 inherit task
 
 
 inherit task
 


@@ -336,4 +336,5 @@ PANDORA_XFCE = " \
   jaaa nmap iperf \
   xf86-video-udlfb \
 #  gnuplot \
   jaaa nmap iperf \
   xf86-video-udlfb \
 #  gnuplot \

+  pandora-version \

 "
 "