From 51f4e4bf0cb1206d8976b10c0443d88eff40711f Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Mon, 20 Jun 2011 01:53:18 +0200 Subject: [PATCH 1/1] pandora-xfce-image: Fixed typo (git log instead of git-log) and added HF version --- recipes/images/pandora-xfce-image.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb index 44e75e1..8b1e8a3 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 = "r6" +PR = "r7" export IMAGE_BASENAME = "pandora-xfce-image" @@ -25,8 +25,9 @@ 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 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 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.6.0.4 (R1 Codename Zaxxon, Hotfix 6, Alpha 4) >> ${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};" -- 2.39.2