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>
Update builder.conf
2026-06-16 02:35:51 +00:00 · 2017-08-08 11:12:14 -07:00 · 2017-08-08 11:03:30 -07:00 · 2017-04-04 13:24:07 -07:00 · 2017-04-04 12:33:12 -07:00 · 2017-04-04 12:29:27 -07:00
3 changed files with 17 additions and 10 deletions
@@ -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
-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
@@ -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:
-        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 = []
@@ -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:
@@ -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)
Author	SHA1	Message	Date
Tudor Marcu	1bb15ab253	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>	2017-08-08 11:12:14 -07:00
Tudor Marcu	02f5c8fad9	Update builder.conf Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2017-08-08 11:03:30 -07:00
Patrick McCarty	579f606714	Merge tag 'v1.09'	2017-04-04 13:24:07 -07:00
Tudor Marcu	537bacec41	Release v1.09 Properly handle m4 errors during build process. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2017-04-04 12:33:12 -07:00
Tudor Marcu	cd634c88df	Release v1.09 Properly handle m4 errors during build process. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2017-04-04 12:29:27 -07:00
Tudor Marcu	0e50054fa1	Exit on m4 error M4 may fail here in the case of circular includes, causing the updater to crash later. This patch checks that the subprocess call succeeded, and if not raises an exception to exit. It may not terminate instantly due to the async nature of processing bundles, but once the bad thread finishes it will exit. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2017-03-22 16:19:04 -07:00
Tudor Marcu	6aa46648d0	Exit on m4 error M4 may fail here in the case of circular includes, causing the updater to crash later. This patch checks that the subprocess call succeeded, and if not raises an exception to exit. It may not terminate instantly due to the async nature of processing bundles, but once the bad thread finishes it will exit. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2017-03-22 15:45:16 -07:00
Patrick McCarty	bcffbb7096	Exclude empty subpackages from the SRPM file lists The string "(contains no files)" is printed when running 'rpm -ql ...' for an empty subpackage. Since that output is more useful for interactive use, make sure the string is excluded from the final SRPM file lists that begin with files-*. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2017-01-24 16:10:28 -08:00
Tudor Marcu	9fc98a03b1	Release v1.08 This release fixes the builder.conf template so it has a more sane starting point. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-11-09 12:13:35 -08:00
Tudor Marcu	c96046001e	Fix builder.conf template Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-11-09 12:13:14 -08:00