split xtaddons kernel package build

diff --git a/client/rebuild-kernel-packages.py b/client/rebuild-kernel-packages.py
index 7de98f5367bb9e7465df660ccb69d9a132979de9..c67aa8b9717ac5a36e4dee753a9e3609d3125448 100755 (executable)
--- a/client/rebuild-kernel-packages.py
+++ b/client/rebuild-kernel-packages.py
@@ -27,8 +27,9 @@ packages = collections.OrderedDict([
     ('xorg-driver-video-nvidia',              ['head', '4.14', '4.9', '4.4']),
     ('xorg-driver-video-nvidia-legacy-340xx', ['head', '4.14', '4.9', '4.4']),
     ('xorg-driver-video-nvidia-legacy-390xx', ['head', '4.14', '4.9', '4.4']),
-    ('xtables-addons',                        ['head', '4.14', '4.9', '4.4']),
     ('zfs',                                   ['head', '4.14', '4.9', '4.4']),
+    ('xtables-addons',                        ['head']),
+    ('xtables-addons:XTADDONS_2',             ['4.14', '4.9', '4.4']),
     ('igb',                                   ['4.4']),
     ('ixgbe',                                 ['4.4']),
     ('nvidiabl',                              ['4.4']),
@@ -208,6 +209,8 @@ def main():
         if not set(kernels).symmetric_difference(args.skip):
             continue
         if args.test_build:
+            if branch:
+                spec = '%s:%s' % (spec, branch)
             command = ("%s -nd %s -d %s --define 'build_kernels %s' --without userspace %s" %
                     (args.make_request, build_mode, args.dist, ','.join(kernels), spec))
         else: