diff options
| author | Annamalai Lakshmanan <annamalai.lakshmanan@linaro.org> | 2012-04-12 09:02:25 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-04-12 10:10:00 +0530 |
| commit | 980a86243dac3f93ee424b662fc4d4f53814071b (patch) | |
| tree | a30a5ddcaa4e86aec5834e3cba3d8506e98fc579 | |
| parent | 9c46c401a8859f2348b942426b6ab5b9db90dc47 (diff) | |
ump: compilation fix for latest svn versionsamsung-android-3.0.4-2012.04
The origen kernel uses some tricks to get versioning
in drivers/gpu/arm/ump/Makefile.
The line setting SVN_REV assumes "svnversion" will report either the
svn revision of the directory or "exported".
This assumption is no longer true for subversion 1.7.4,
which reports "Unversioned directory" instead of "exported",
causing the build to fail (gcc -DSVN_REV=Unversioned directory .....)
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Signed-off-by: Annamalai Lakshmanan <annamalai.lakshmanan@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/gpu/arm/ump/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/arm/ump/Makefile b/drivers/gpu/arm/ump/Makefile index eb896edef108..6451365a8052 100644 --- a/drivers/gpu/arm/ump/Makefile +++ b/drivers/gpu/arm/ump/Makefile @@ -60,8 +60,8 @@ ump-y:= $(UMP_FILE_PREFIX)common/ump_kernel_common.o \ $(UMP_FILE_PREFIX)../mali/linux/mali_osk_misc.o # Get subversion revision number, fall back to 0000 if no svn info is available -SVN_REV:=$(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') - +SVN_REV:=$(shell ((svnversion | grep -qvE '(exported|Unversioned)' && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') + EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" |