aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-04-07 18:04:18 (GMT)
committerHans Verkuil <hverkuil@xs4all.nl>2011-04-07 18:04:18 (GMT)
commitab695951c743140fcca525855959f4ce1f2ba6f3 (patch)
treeda137b39fe4f4b2fa8fdc02fbe6041541215201b
parentb81e594128c47642a0759d5a4187680c5761ad9c (diff)
Fix make tar and make dir targets.
The git_log generation is now identical for make todaytar and these other make targets. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--linux/Makefile2
-rwxr-xr-xlinux/use_dir.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/Makefile b/linux/Makefile
index a58246e..09b0965 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -78,7 +78,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 |sed -r s,'([\x22\x25\x5c])','\x5c\\1',g >git_log
+ 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
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 95df457..74d0cb9 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^1^1..HEAD | head -5 | |sed -r s,'([\x22\x25\x5c])','\x5c\\1',g >git_log"
+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"

Privacy Policy