Release v1.10

This release fixes the builder.conf template to match what is shown in
the documentation page.

Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>

builder.conf

@@ -1,13 +1,12 @@
 [Builder]
 SERVER_STATE_DIR=/home/clr/mix/update
-BUNDLE_DIR=/home/clr/mix/bundles
+BUNDLE_DIR=/home/clr/mix/mix-bundles
 YUM_CONF=/home/clr/mix/.yum-mix.conf
-CERT=/home/clr/mix/ClearLinuxRoot.pem
+CERT=/home/clr/mix/Swupd_Root.pem
-CLEAR_VERSION=VER
+VERSIONS_PATH=/home/clr/mix
-MIX_VERSION=VER
 
 [swupd]
 BUNDLE=os-core-update
-CONTENTURL=https://download.clearlinux.org/update/
+CONTENTURL=<URL where the content will be hosted>
-VERSIONURL=https://download.clearlinux.org/update/
+VERSIONURL=<URL where the version of the mix will be hosted>
 FORMAT=1

bundle-chroot-builder.py

@@ -74,9 +74,13 @@ def read_config(args):
 def install_bundle(out_dir, postfix, bundle, bundles, yum_cmd):
     """Helper function to yum install a bundle"""
     lines = []
-    with subprocess.Popen(["m4", bundles + "/" + bundle], cwd=bundles, stdout=subprocess.PIPE, bufsize=1, universal_newlines=True) as p:
+    try:
-        for line in p.stdout:
+        output = subprocess.check_output(["m4", bundles + "/" + bundle], cwd=bundles, bufsize=1, universal_newlines=True)
-            lines.append(line)
+    except subprocess.CalledProcessError as e:
+        print('ERROR {0}: m4 failed on {1}/{2}'.format(e.returncode, bundles, bundle))
+        raise
+    for line in output:
+        lines.append(line)
 
     pkgs = "".join(lines)
     to_install = []
@@ -331,6 +335,10 @@ def create_chroots(args, state_dir, bundles, yum_conf):
         if package_name not in package_mapping:
             package_mapping[package_name] = set()
         for path in path_list:
+            # RPM prints out a specific string for subpackages that contain no
+            # files. It should be excluded from the SRPM file list.
+            if re.match(br"\(contains no files\)\n", path):
+                continue
             package_mapping[package_name].add(path)
     for package_name, paths in package_mapping.items():
         with open(out_dir + "/files-{}".format(package_name), "wb") as file:

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([bundle-chroot-builder],[1.07],[tudor.marcu@intel.com],[bundle-chroot-builder])
+AC_INIT([bundle-chroot-builder],[1.10],[tudor.marcu@intel.com],[bundle-chroot-builder])
 AM_INIT_AUTOMAKE([foreign silent-rules color-tests no-dist-gzip dist-xz])
 AC_CONFIG_FILES(Makefile)
 AC_PREFIX_DEFAULT(/usr/local)