From c6458cdfa19cb2fdc37febf8341efcc5fb023bbf Mon Sep 17 00:00:00 2001 From: Robert Rosengren Date: Tue, 21 Dec 2010 14:28:22 +0100 Subject: MeeGo: Adding git version to boot log The git version have been missing in the boot log when building in MeeGo, since MeeGo is building in OBS and not in git source tree. This patch adds a customized git2obs script that will both archive the git and generate a correct version file. The version file will then be used by the Makefile when building. ST-Ericsson ID: 317452 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I22edc5d94b909307dd1539c4ff8645f771f12306 Signed-off-by: Robert Rosengren Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11432 Reviewed-by: QATOOLS Reviewed-by: Robert MARKLUND Reviewed-by: Michael BRANDT --- .git2obs | 35 +++++++++++++++++++++++++++++++++++ u-boot-u8500.spec | 2 ++ 2 files changed, 37 insertions(+) create mode 100755 .git2obs diff --git a/.git2obs b/.git2obs new file mode 100755 index 000000000..dbe129c0e --- /dev/null +++ b/.git2obs @@ -0,0 +1,35 @@ +#!/bin/bash + +# Input to script, mandatory. +[ -z "$TEMP_DIR" ] && TEMP_DIR="./tmp" + +if [ -z "$1" ]; then + echo "usage: $(basename $0) spec-file" + exit 1 +else + SPEC="$1" +fi + + +# Grab archive name +MODULE_ARCHIVE_NAME=$(basename "$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Source0:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')") +[ -z $MODULE_ARCHIVE_NAME ] && MODULE_ARCHIVE_NAME=$(basename "$(rpm --eval "$(head -n 200 $SPEC)" | grep -r "^Source:" | sed -re 's/.*?:[\t ]+(.*?)[\t ]*/\1/g')") +MODULE_ARCHIVE_NAME="$(echo "$MODULE_ARCHIVE_NAME" | sed -e "s|%{name}|$MODULE_NAME|" -e "s|%{version}|$MODULE_VERSION|")" + +# Set prefix name +[ -z "$PREFIX_NAME" ] && PREFIX_NAME="$(echo $MODULE_ARCHIVE_NAME | sed 's/.tar.bz2//g' | sed 's/.tar.gz//g')" + +mkdir -p $TEMP_DIR + +# Make the new archive +if [[ "$MODULE_ARCHIVE_NAME" =~ bz2$ ]]; then + git archive --format=tar --prefix=$PREFIX_NAME/ HEAD | bzip2 > $TEMP_DIR/$MODULE_ARCHIVE_NAME +elif [[ "$MODULE_ARCHIVE_NAME" =~ gz$ ]]; then + git archive --format=tar --prefix=$PREFIX_NAME/ HEAD | gzip > $TEMP_DIR/$MODULE_ARCHIVE_NAME +else + echo "Warning: No archive in Source0, skipping archiving the git!" +fi + +#Generate git version file +TOPDIR="`pwd`" +$TOPDIR/tools/setlocalversion $TOPDIR > $TEMP_DIR/localversion-meegobuild diff --git a/u-boot-u8500.spec b/u-boot-u8500.spec index fdb5e47f8..8d0f1bdd6 100644 --- a/u-boot-u8500.spec +++ b/u-boot-u8500.spec @@ -10,6 +10,7 @@ Version: %{base_version} License: GPL URL: http://www.denx.de/wiki/U-Boot Source0: %{base_name}-%{base_version}.tar.bz2 +Source1: localversion-meegobuild Source100: %{base_name}-rpmlintrc Summary: Das U-Boot boot loader binary @@ -32,6 +33,7 @@ U-Boot utility for creating bootable kernel images. %prep %setup -q -n %{base_name}-%{base_version} +cp %{SOURCE1} . %build #Make default config for variant -- cgit v1.2.3