merge from trunk

2 files changed, 12 insertions, 1 deletions

diff --git a/packages/bddeb b/packages/bddeb
index 7ae07a80..30559870 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -32,11 +32,12 @@ PKG_MP = {
     'boto': 'python-boto',
     'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
+    'jsonpatch': 'python-json-patch',
     'oauth': 'python-oauth',
     'prettytable': 'python-prettytable',
+    'pyserial': 'python-serial',
     'pyyaml': 'python-yaml',
     'requests': 'python-requests',
-    'jsonpatch': 'python-json-patch',
 }
 DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
 
@@ -95,12 +96,20 @@ def main():
                         default=False,
                         action='store_true')
 
+    parser.add_argument("--init-system", dest="init_system",
+                        help=("build deb with INIT_SYSTEM=xxx"
+                              " (default: %(default)s"),
+                        default=os.environ.get("INIT_SYSTEM", "upstart"))
+
+
     for ent in DEBUILD_ARGS:
         parser.add_argument(ent, dest="debuild_args", action='append_const',
             const=ent, help=("pass through '%s' to debuild" % ent))
 
     args = parser.parse_args()
 
+    os.environ['INIT_SYSTEM'] = args.init_system
+
     capture = True
     if args.verbose:
         capture = False
diff --git a/packages/brpm b/packages/brpm
index 91a0a0ec..8c90a0ab 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -42,6 +42,7 @@ PKG_MP = {
         'jsonpatch': 'python-jsonpatch',
         'oauth': 'python-oauth',
         'prettytable': 'python-prettytable',
+        'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
         'requests': 'python-requests',
     },
@@ -53,6 +54,7 @@ PKG_MP = {
         'jsonpatch': 'python-jsonpatch',
         'oauth': 'python-oauth',
         'prettytable': 'python-prettytable',
+        'pyserial': 'python-pyserial',
         'pyyaml': 'python-yaml',
         'requests': 'python-requests',
     }