aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-04-07 12:53:22 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-04-07 12:57:30 (GMT)
commit000439933f6f642ccf12f80b9407fa55398a9633 (patch)
tree8ee3c3fa6727c51f7bd6165823c70308aebcb394
parentcd83b3f0f6a3a734147665a907f573e95c58dce2 (diff)
fix git_log information
git_log should contain the last applied patches to a tree. It is there to help developers to analize an user report. Due to two small bugs, it were producing long lists, and outputing control characters like \, % and ". This patch reverts changeset 139af0392c9b3bb0cf13235762931b2f93f89c61 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/Makefile4
-rwxr-xr-xlinux/use_dir.pl2
-rwxr-xr-xlinux/version_patch.pl6
3 files changed, 4 insertions, 8 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 2c320ff..8c0d96e 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -61,7 +61,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 >git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD | head -3 |sed -r s,"[\x01-\x1f\x21-\x2f\x3a-\x40]"," ",g >git_log
tar rvf $(PWD)/$(TODAY_TAR) git_log
for i in $(TARDIR); do \
if [ "`echo $$i|grep Documentation`" = "" ]; then \
@@ -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 >git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD | head -3 | sed -r s,"[\x01-\x1f\x21-\x2f\x3a-\x40]"," ",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 e0251fd..5da3acf 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^1..HEAD >git_log"
+system "git --git-dir $dir/.git log --pretty=oneline HEAD^1^1^1^1^1..HEAD | head -5 | sed -r s,"[\x01-\x1f\x21-\x2f\x3a-\x40]"," ",g >git_log"
diff --git a/linux/version_patch.pl b/linux/version_patch.pl
index 9416fb5..5df05c7 100755
--- a/linux/version_patch.pl
+++ b/linux/version_patch.pl
@@ -34,11 +34,7 @@ sub patch_file($$$$)
$file .= "\tprintk(KERN_ERR \"$warning\\n" .
"\\tAs the driver is backported to an older kernel, it doesn't offer\\n" .
"\\tenough quality for its usage in production.\\n" .
- "\\tUse it with care.\\n\");\n";
-# This was:
-# "\\tUse it with care.\\n$media_build_version\\n\");\n";
-# but $media_build_version can be huge and full of weird characters.
-# We need a better solution for this, but for now just comment it out.
+ "\\tUse it with care.\\n$media_build_version\\n\");\n";
$is_function = 0;
$patched++;
next;

Privacy Policy