remove caiaq- files

diff --git a/alsatool b/alsatool
index ea65353c05621ccc473603719319e633c4405339..200eb22178e340e0bf1f5a81aae2a519e9ce8279 100755 (executable)
--- a/alsatool
+++ b/alsatool
@@ -992,8 +992,8 @@ def kmirrorcheck(argv):
                raise ValueError, "kmirror: git checkout master"
        if os.system("git pull origin master"):
                raise ValueError, "kmirror: git pull origin master"
-       kcommits = parse_log(os.popen("git log --reverse --pretty=fuller --date=iso v1.0.16..HEAD"))
-       print("Found %s commits after v1.0.16" % len(kcommits))
+       kcommits = parse_log(os.popen("git log --reverse --pretty=fuller --date=iso v1.0.19..HEAD"))
+       print("Found %s commits after v1.0.19" % len(kcommits))
        
        os.chdir(ROOT + '/alsa-kernel')
        if full:
@@ -1132,7 +1132,7 @@ The following files will be updated:
        print(lines)
 
 def kimport(argv=None):
-       #repos = argv and {} or {'tiwai':'master'}
+       repos = {}
        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 12a48762a65b255f7670b48f2d3f420abd9212f6..fb76823c2b2473bdbcc6ba70263f808d5c45a05c 100755 (executable)
--- a/hooks/alsa-kernel.git/pre-receive
+++ b/hooks/alsa-kernel.git/pre-receive
@@ -410,7 +410,13 @@ def compare_trees(lastref):
              'aoa/soundbus/i2sbus/i2sbus-core.c', 'aoa/soundbus/i2sbus/i2sbus-interface.h',
              'aoa/soundbus/i2sbus/i2sbus-pcm.c', 'aoa/codecs/snd-aoa-codec-tas.h',
              'include/uda1341.h', 'i2c/l3/', 'arm/sa11xx-uda1341.c',
-             'soc/at91/', 'soc/at32/']:
+             'soc/at91/', 'soc/at32/',
+             'usb/caiaq/caiaq-audio.c', 'usb/caiaq/caiaq-audio.h',
+             'usb/caiaq/caiaq-control.c', 'usb/caiaq/caiaq-control.h',
+             'usb/caiaq/caiaq-device.c', 'usb/caiaq/caiaq-device.h',
+             'usb/caiaq/caiaq-input.c', 'usb/caiaq/caiaq-input.h',
+             'usb/caiaq/caiaq-midi.c', 'usb/caiaq/caiaq-midi.h'
+             ]:
         if isdir("alsa-kernel-repo/%s" % i):
             rmtree("alsa-kernel-repo/%s" % i)
         elif exists("alsa-kernel-repo/%s" % i):