aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-10 15:59:58 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-06-10 16:02:16 (GMT)
commit48f1fb025c925387d0694853d686bb701d4429c4 (patch)
tree26645de443de9b4d428f7e2c4121fd507bcb3e9e
parentf6f2273a9f1c23d500f74306f3f6948f8bfff96d (diff)
linux/Makefile: Fix aspas escaping at git_log
The aspas scaping logic were breaking the compilation. Fixes it, by just removing the aspas character. While here, use the "-n" git log syntax, instead of a weird logic to just show the last 3 logs. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/Makefile4
-rwxr-xr-xlinux/use_dir.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 5507359..f2cda05 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -62,7 +62,7 @@ todaytar:
@if [ "$(DIR)" = "" ]; then echo "make $@ DIR=<version>"; exit -1; fi
-rm -f $(PWD)/$(TODAY_TAR).bz2
tar cf $(PWD)/$(TODAY_TAR) -C $(DIR) $(TARFILES)
- git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD | head -3 |sed -r s,'([\x22\x25\x5c])','\x5c\\1',g >git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline -n3 |sed -r 's,([\x22]),,g; s,([\x25\x5c]),\x5c\\1,g' >git_log
tar rvf $(PWD)/$(TODAY_TAR) git_log
for i in $(TARDIR); do \
if [ "`echo $$i|grep Documentation`" = "" ]; then \
@@ -79,7 +79,7 @@ tar:
@if [ "$(DIR)" = "" ]; then echo "make $@ DIR=<version>"; exit -1; fi
-rm -f $(PWD)/linux-media.tar.bz2
tar cf $(PWD)/linux-media.tar -C $(DIR) $(TARFILES)
- git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD | head -3 |sed -r s,'([\x22\x25\x5c])','\x5c\\1',g >git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline -n3 |sed -r 's,([\x22]),,g; s,([\x25\x5c]),\x5c\\1,g' >git_log
tar rvf $(PWD)/linux-media.tar git_log
for i in $(TARDIR); do \
if [ "`echo $$i|grep Documentation`" = "" ]; then \
diff --git a/linux/use_dir.pl b/linux/use_dir.pl
index 74d0cb9..6ade8c5 100755
--- a/linux/use_dir.pl
+++ b/linux/use_dir.pl
@@ -312,4 +312,4 @@ if ($get_patched && $patches_applied) {
}
write_ctlfile();
-system "git --git-dir $dir/.git log --pretty=oneline HEAD^1^1^1..HEAD | head -3 | sed -r s,'([\x22\x25\x5c])','\x5c\\1',g >git_log"
+system "git --git-dir $(DIR)/.git log --pretty=oneline -n3 |sed -r 's,([\x22]),,g; s,([\x25\x5c]),\x5c\\1,g' >git_log"

Privacy Policy