Release v1.11

This release adds a configuration section for debuginfo banning in the
swupd-server configuration file server.ini.

Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>

builder.conf

@@ -1,13 +1,17 @@
 [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
-CLEAR_VERSION=VER
-MIX_VERSION=VER
+CERT=/home/clr/mix/Swupd_Root.pem
+VERSIONS_PATH=/home/clr/mix
 
 [swupd]
 BUNDLE=os-core-update
-CONTENTURL=https://download.clearlinux.org/update/
-VERSIONURL=https://download.clearlinux.org/update/
+CONTENTURL=<URL where the content will be hosted>
+VERSIONURL=<URL where the version of the mix will be hosted>
 FORMAT=1
+
+[Server]
+debuginfo_banned=true
+debuginfo_lib=/usr/lib/debug/
+debuginfo_src=/usr/src/debug/

bundle-chroot-builder.py

@@ -47,16 +47,21 @@ def handle_options():
     return args
 
 
-def read_config(args):
+def get_config(args):
     buildconf='/usr/share/defaults/bundle-chroot-builder/builder.conf'
     if os.path.isfile('/etc/bundle-chroot-builder/builder.conf'):
         buildconf = '/etc/bundle-chroot-builder/builder.conf'
     if args.config:
         buildconf = args.config
+
     config = configparser.ConfigParser()
     print("Reading from %s" % buildconf)
     config.read(buildconf)
+    return config
 
+
+def read_config(args):
+    config = get_config(args)
     for option in ['SERVER_STATE_DIR', 'BUNDLE_DIR', 'YUM_CONF']:
             if config.has_option('Builder', option) == False:
                 print("ERROR:\nbuilder.conf is missing:\n[Builder]\n%s\n" % option)
@@ -74,9 +79,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:
-        for line in p.stdout:
-            lines.append(line)
+    try:
+        output = subprocess.check_output(["m4", bundles + "/" + bundle], cwd=bundles, bufsize=1, universal_newlines=True)
+    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 = []
@@ -147,6 +156,37 @@ def clean_bundle(out_dir, bundle, bundles, yum_cmd):
     os.chdir(prev_dir)
 
 
+def write_default_server_ini(state_dir, server_conf):
+    """
+    Write default server.ini file in the state dir in the following format
+
+    [Server]
+    emptydir={state_dir}/empty/
+    imagebase={state_dir}/image/
+    outputdir={state_dir}/www/
+
+    [Debuginfo]
+    banned=true
+    lib=/usr/lib/debug/
+    src=/usr/src/debug/
+    """
+    contents = ("[Server]\n"
+                "emptydir={0}/empty/\n"
+                "imagebase={0}/image/\n"
+                "outputdir={0}/www/\n".format(state_dir))
+    if server_conf:
+        contents += ("\n[Debuginfo]\n"
+                    "banned={}\n"
+                    "lib={}\n"
+                    "src={}\n"
+                    .format(server_conf.get('debuginfo_banned'),
+                            server_conf.get('debuginfo_lib'),
+                            server_conf.get('debuginfo_src')))
+
+    with open(state_dir + "/server.ini", "w+") as serverini:
+        serverini.write(contents)
+
+
 def create_chroots(args, state_dir, bundles, yum_conf):
     """The state_dir should always be created if it does not exist"""
     if os.path.isdir(state_dir) == False:
@@ -160,14 +200,15 @@ def create_chroots(args, state_dir, bundles, yum_conf):
     if os.path.isdir(state_dir + "/www/0") == False:
         os.makedirs(state_dir + "/www/0")
 
-    """Create server.ini and groups.ini for create_update later on"""
-    with open(state_dir + "/server.ini", "w+") as serverini:
-        serverini.write("[Server]\nemptydir=" + state_dir + "/empty/\nimagebase=" + state_dir + "/image/\noutputdir=" + state_dir + "/www/\n")
+    # Create server.ini and groups.ini for create_update later on
+    config = get_config(args)
+    config = config['Server'] if 'Server' in config else {}
+    write_default_server_ini(state_dir, config)
     with open(state_dir + "/groups.ini", "w+") as groupsini:
         bundle_list = os.listdir(bundles)
         bundle_list = trim_bundles(bundle_list)
         for bundle in bundle_list:
-            groupsini.write("[" + bundle + "]\ngroup=" + bundle + "\n\n")
+            groupsini.write("[{0}]\ngroup={0}\n\n".format(bundle))
 
     """Setup chroots for bundles"""
     bversion = ""
@@ -284,13 +325,7 @@ def create_chroots(args, state_dir, bundles, yum_conf):
         r.get()
 
     """Read the URL values from builder.conf and insert them into os-core-update to swupd knows where to pull content from"""
-    buildconf='/usr/share/defaults/bundle-chroot-builder/builder.conf'
-    if os.path.isfile('/etc/bundle-chroot-builder/builder.conf'):
-        buildconf = '/etc/bundle-chroot-builder/builder.conf'
-    if args.config:
-        buildconf = args.config
-    config = configparser.ConfigParser()
-    config.read(buildconf)
+    config = get_config(args)
 
     """Read the configuration file for our script values"""
     for option in ['BUNDLE', 'CONTENTURL', 'VERSIONURL', 'FORMAT']:
@@ -331,6 +366,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.11],[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)