summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkranzer <bernhard.rosenkranzer@linaro.org>2012-05-23 15:50:02 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-23 15:57:03 +0200
commit5bd3314357fc6ec991071e0bb2f959fb98bc881c (patch)
tree64521cdb969df8b447fdba932fd3d32cb7962812
parent6020a86def5b4ce377a843315bcf66c9ce9ca37c (diff)
android: compilation failure with new version of svnmali-generic
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 Rosenkranzer <bernhard.rosenkranzer@linaro.org> Submitted-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rw-r--r--drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Makefile.common2
-rw-r--r--drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Makefile.common b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Makefile.common
index ebe3b9e3399..a8f4189d0cf 100644
--- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Makefile.common
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/Makefile.common
@@ -37,7 +37,7 @@ MALI_PLATFORM_FILE=platform/default/mali_platform.c
endif
# Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available
-SVN_REV := $(shell (cd $(DRIVER_DIR); (svnversion | grep -qv exported && svnversion) || git svn info | grep '^Revision: '| sed -e 's/^Revision: //' ) 2>/dev/null )
+SVN_REV := $(shell (cd $(DRIVER_DIR); (svnversion | grep -qvE '(exported|Unversioned)' && svnversion) || git svn info | grep '^Revision: '| sed -e 's/^Revision: //' ) 2>/dev/null )
ifeq ($(SVN_REV),)
SVN_REV := $(MALI_RELEASE_NAME)
else
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common
index c6aa6337f80..f797c85a6f2 100644
--- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/Makefile.common
@@ -14,7 +14,6 @@ SRC = $(UMP_FILE_PREFIX)common/ump_kernel_common.c \
$(UMP_FILE_PREFIX)common/ump_kernel_ref_drv.c
# 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)\"