From 8fcd62562d5669bbe6eac8451e1428dae5e75239 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 15 Feb 2012 03:37:11 +0200 Subject: [PATCH] pandora-xfce-image.bb: temporary hack to pull in another kernel --- recipes/images/pandora-xfce-image.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb index 1be2f54..5479002 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 = "r11" +PR = "r12" export IMAGE_BASENAME = "pandora-xfce-image" @@ -27,7 +27,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.7.0.3 - R1 Codename Zaxxon, Hotfix 7, Beta 1>> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Version: 1.7.0.3 - R1 Codename Zaxxon, Hotfix 7, Beta 2>> ${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};" @@ -37,3 +37,6 @@ ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a S0:2345:once:/sbin/getty 115200 ttyS0' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;" 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;" -- 2.39.2