aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 17:31:14 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 17:31:14 (GMT)
commit834d0d32f8d3c8d3f2dfc1fed42140ddb34cad5d (patch)
tree14a3285fce7d3cb867ff9489289f4613892b817e
parentffc61302bceae4edef3f773d70de73de9ea4849e (diff)
Fix addition of git_log into the generated tarball
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/Makefile6
-rwxr-xr-xlinux/use_dir.pl2
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/Makefile b/linux/Makefile
index d8797cd..056e432 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -61,8 +61,8 @@ 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^1^1^1^1^1..HEAD >git_log
- tar rvf $(PWD)/linux-media.tar git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD >git_log
+ tar rvf $(PWD)/$(TODAY_TAR) git_log
for i in $(TARDIR); do \
if [ "`echo $$i|grep Documentation`" = "" ]; then \
dir="`(cd $(DIR); find $$i -type f -name '*.[ch]')`"; \
@@ -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^1^1^1^1^1..HEAD >git_log
+ git --git-dir $(DIR)/.git log --pretty=oneline HEAD^1^1^1..HEAD >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 015c9ac..80f6b41 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^1^1..HEAD >git_log"
+system "git --git-dir $dir/.git log --pretty=oneline HEAD1^1^1^1^1^1..HEAD >git_log"

Privacy Policy