Add ASoC: to prereceive

diff --git a/alsatool b/alsatool
index 69c292589d4597a1dc79f7282e0da7c242e8515f..ea65353c05621ccc473603719319e633c4405339 100755 (executable)
--- a/alsatool
+++ b/alsatool
@@ -979,6 +979,9 @@ def kmirrorcheck(argv):
                return str.strip()
 
        full = argv and argv[0] == 'full'
+       fromrev = 'linux-2.6'
+       if argv and len(argv) > 1:
+         fromrev = argv[1]
 
        print("Analyzing git-ok-commits..")
        git_ok_commits = read_git_ok_commits()
@@ -994,7 +997,7 @@ def kmirrorcheck(argv):
        
        os.chdir(ROOT + '/alsa-kernel')
        if full:
-               log1 = os.popen("git log --reverse --name-only --pretty=oneline --date=iso linux-2.6..master")
+               log1 = os.popen("git log --reverse --name-only --pretty=oneline --date=iso %s..master" % fromrev)
        else:
                print("Looking for a common base...")
                base = os.popen("git merge-base %s linux-2.6" % getorigin()).read(1024).strip()
@@ -1129,7 +1132,7 @@ The following files will be updated:
        print(lines)
 
 def kimport(argv=None):
-       repos = argv and {} or {'tiwai':'master'}
+       #repos = argv and {} or {'tiwai':'master'}
        if argv:
                for i in argv:
                        a, b = i.split(i.find(':') > 0 and ':' or '/')

diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive
index 8c572257693df1b3da816be9a5238fd026666c72..58399b2a38e27c05cbf939d89805eb74a89a9744 100755 (executable)
--- a/hooks/alsa-kernel.git/pre-receive
+++ b/hooks/alsa-kernel.git/pre-receive
@@ -330,6 +330,7 @@ def do_check_commit(lines):
     #    exit(1)
     if not lines[6][4:].upper().startswith('[ALSA] ') and \
        not lines[6][4:].upper().startswith('ALSA: ') and \
+       not lines[6][4:].upper().startswith('ASoC: ') and \
        not lines[6][4:].upper().startswith('[SOUND] ') and \
        not lines[6][4:].upper().startswith('SOUND: '):
         error(lines, 'First log line does not start with "[ALSA] " or "ALSA: " or "[SOUND] " or "SOUND: "\n')