diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-23 08:58:28 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-09-23 08:58:28 -0400 |
| commit | 2d094d043f9bd42c8388598c3210c142933f948e (patch) | |
| tree | 6d8b2a8211d88bd0a7d578baa2488f98296e2b2e | |
| parent | 21087ebcc1a36c736130ff4b903129f0b183233d (diff) | |
| parent | f99e726d4ee856dd178734c8fe3ee2ea49fb9fa6 (diff) | |
| download | kernel_samsung_smdk4412-2d094d043f9bd42c8388598c3210c142933f948e.zip kernel_samsung_smdk4412-2d094d043f9bd42c8388598c3210c142933f948e.tar.gz kernel_samsung_smdk4412-2d094d043f9bd42c8388598c3210c142933f948e.tar.bz2 | |
Merge "mali: fix getting subversion revision number" into jellybean
| -rw-r--r-- | drivers/media/video/samsung/mali/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/video/samsung/ump/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/samsung/mali/Makefile b/drivers/media/video/samsung/mali/Makefile index db5ce6a..aa4b255 100644 --- a/drivers/media/video/samsung/mali/Makefile +++ b/drivers/media/video/samsung/mali/Makefile @@ -320,7 +320,7 @@ ifeq ($(PANIC_ON_WATCHDOG_TIMEOUT),1) endif # 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 -E "^[0-9]+" && 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)\" diff --git a/drivers/media/video/samsung/ump/Makefile b/drivers/media/video/samsung/ump/Makefile index b3157a3..1ac28d7 100644 --- a/drivers/media/video/samsung/ump/Makefile +++ b/drivers/media/video/samsung/ump/Makefile @@ -86,7 +86,7 @@ EXTRA_CFLAGS += $(INCLUDES) \ # 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 -E "^[0-9]+" && 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)\" |