Release v1.09

Properly handle m4 errors during build process. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Exit on m4 error
2026-08-18 19:45:49 +00:00 · 2017-04-04 12:29:27 -07:00 · 2017-03-22 15:45:16 -07:00 · 2016-11-09 12:13:35 -08:00 · 2016-11-09 12:13:14 -08:00 · 2016-11-04 17:56:58 -07:00
3 changed files with 18 additions and 10 deletions
@@ -1,10 +1,13 @@
 [Builder]
-SERVER_STATE_DIR = /var/lib/update
-BUNDLE_DIR = /home/clr/mix/bundles
-YUM_CONF = /usr/share/defaults/bundle-chroot-builder/yum.conf
+SERVER_STATE_DIR=/home/clr/mix/update
+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

 [swupd]
 BUNDLE=os-core-update
-CONTENTURL=https://download.clearlinux.org/update/
-VERSIONURL=https://download.clearlinux.org/update/
-FORMAT=3
+CONTENTURL=<URL where the content will be hosted>
+VERSIONURL=<URL where the version of the mix will be hosted>
+FORMAT=1
@@ -54,6 +54,7 @@ def read_config(args):
    if args.config:
        buildconf = args.config
    config = configparser.ConfigParser()
+    print("Reading from %s" % buildconf)
    config.read(buildconf)

    for option in ['SERVER_STATE_DIR', 'BUNDLE_DIR', 'YUM_CONF']:
@@ -73,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 = []
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([bundle-chroot-builder],[1.06],[tudor.marcu@intel.com],[bundle-chroot-builder])
+AC_INIT([bundle-chroot-builder],[1.09],[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	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	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
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
Tudor Marcu	0d0e64e2a9	Release v1.07 This release updates bundle-chroot-builder to support the new mixer-tools and builder.conf format. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-11-04 17:56:58 -07:00
Tudor Marcu	be05f6b513	Default to outputting content in the mixer workspace Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-10-28 13:09:03 -07:00
Tudor Marcu	d07ac01932	Update builder.conf to match docs and new tooling Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-10-28 12:18:09 -07:00
Tudor Marcu	82bd4409f8	Version numbers are now read from builder.conf Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-10-28 11:55:35 -07:00
Tudor Marcu	78e419ee2c	Print out which builder.conf is being used Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>	2016-10-27 12:13:13 -07:00