Release v1.06

This release moves the noship folder to the chroot location, because chroot
builder should not be adding any content to the webdir, and renames the
latest.version file to more appropriately match its use.

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

bundle-chroot-builder.py

@@ -163,7 +163,9 @@ def create_chroots(args, state_dir, bundles, yum_conf):
     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")
     with open(state_dir + "/groups.ini", "w+") as groupsini:
-        for bundle in os.listdir(bundles):
+        bundle_list = os.listdir(bundles)
+        bundle_list = trim_bundles(bundle_list)
+        for bundle in bundle_list:
             groupsini.write("[" + bundle + "]\ngroup=" + bundle + "\n\n")
 
     """Setup chroots for bundles"""
@@ -175,8 +177,8 @@ def create_chroots(args, state_dir, bundles, yum_conf):
         out_version = args.version
     build_version = args.version
 
-    if os.path.exists(state_dir + "/image/latest.version") == False:
-        with open(state_dir + "/image/latest.version", "w") as latestver:
+    if os.path.exists(state_dir + "/image/LAST_VER") == False:
+        with open(state_dir + "/image/LAST_VER", "w") as latestver:
             latestver.write("0\n")
 
     config = configparser.ConfigParser()
@@ -261,6 +263,7 @@ def create_chroots(args, state_dir, bundles, yum_conf):
 
     bundle_list = os.listdir(bundles)
     bundle_list.remove('os-core')
+    bundle_list = trim_bundles(bundle_list)
     pool = multiprocessing.Pool()
     results_list = []
 
@@ -299,15 +302,19 @@ def create_chroots(args, state_dir, bundles, yum_conf):
     versionurl = conf['VERSIONURL']
     formatname = conf['FORMAT']
 
+    print("Adding SWUPD default values to '{}' bundle...".format(bundlename))
     """Do not add a leading slash on anything except the first variable in os.path.join!"""
     confpath = os.path.join(out_dir, bundlename, "usr/share/defaults/swupd/")
     os.makedirs(confpath, exist_ok=True)
     with open(os.path.join(confpath, "contenturl"), "w") as file:
         file.writelines(contenturl)
+    print("  contenturl: {}".format(contenturl))
     with open(os.path.join(confpath, "versionurl"), "w") as file:
         file.writelines(versionurl)
+    print("  versionurl: {}".format(versionurl))
     with open(os.path.join(confpath, "format"), "w") as file:
         file.writelines(formatname)
+    print("  format: {}".format(formatname))
 
     print("Creating package to file mappings")
     package_mapping = {}
@@ -318,14 +325,14 @@ def create_chroots(args, state_dir, bundles, yum_conf):
         # real package's filename I'm using it instead of recursing through
         # temporary per bundle folders
         package_name = map_file[map_file.find(" * ") + 3:-len(".src.rpm")]
-        with open(out_dir + "/" +  map_file, "r") as file:
+        with open(out_dir + "/" +  map_file, "rb") as file:
             path_list = file.readlines()
         if package_name not in package_mapping:
             package_mapping[package_name] = set()
         for path in path_list:
             package_mapping[package_name].add(path)
     for package_name, paths in package_mapping.items():
-        with open(out_dir + "/files-{}".format(package_name), "w") as file:
+        with open(out_dir + "/files-{}".format(package_name), "wb") as file:
             file.writelines(sorted(paths))
     for map_file in map_files:
         os.unlink(out_dir + "/" + map_file)
@@ -335,16 +342,17 @@ def create_chroots(args, state_dir, bundles, yum_conf):
 
     print("Cleaning package list")
     web_dir = state_dir + "/www/" + out_version + "/"
+    image_dir = state_dir + "/image/" + out_version + "/"
     if os.path.isdir(web_dir):
         print("  removing pre-existing {} before setting version file" .format(web_dir))
         os.system('rm -rf '+web_dir)
     # FIXME: Figure out problems with the below to replace the above.
     # Consider all uses of os.system("rm -fr") as FIXMEs of the same variety.
-    # if os.path.isdir(web_dir):
+    # if os.path.isdir(image_dir):
     #     print("  removing pre-existing {} before setting version file"
-    #           .format(web_dir))
-    #     shutil.rmtree(web_dir)
-    os.makedirs(web_dir + '/noship')
+    #           .format(imagedir())
+    #     shutil.rmtree(image_dir)
+    os.makedirs(image_dir + '/noship')
     versions_output = []
     with open(out_dir + "/versions", "r") as file:
         versions = set()
@@ -362,16 +370,24 @@ def create_chroots(args, state_dir, bundles, yum_conf):
         versions_output.append("{0: <50}{1}\n".format("Available", "Packages"))
         for name, pver in [line.split(":") for line in versions]:
             versions_output.append("{0: <50}{1}\n".format(name, pver))
-    with open(web_dir + "versions", "w") as file:
+    with open(image_dir + "versions", "w") as file:
         file.writelines(versions_output)
-    for bundle in os.listdir(bundles):
-        shutil.copyfile(out_dir + "/packages-{}".format(bundle), web_dir + "/noship/packages-{}".format(bundle))
+    bundle_list = os.listdir(bundles)
+    bundle_list = trim_bundles(bundle_list)
+    for bundle in bundle_list:
+        shutil.copyfile(out_dir + "/packages-{}".format(bundle), image_dir + "/noship/packages-{}".format(bundle))
         if os.path.isfile(out_dir + "/{}-includes".format(bundle)):
-            shutil.copyfile(out_dir + "/{}-includes".format(bundle), web_dir + "/noship/{}-includes".format(bundle))
+            shutil.copyfile(out_dir + "/{}-includes".format(bundle), image_dir + "/noship/{}-includes".format(bundle))
     for package_name in package_mapping.keys():
         shutil.copyfile(out_dir + "/files-{}".format(package_name),
-                        web_dir + "/noship/files-{}".format(package_name))
+                        image_dir + "/noship/files-{}".format(package_name))
 
+# Remove bundles with blacklisted characters, such as dot files
+def trim_bundles(bundles):
+    for bundle in bundles:
+        if bundle.startswith('.'):
+            bundles.remove(bundle)
+    return bundles
 
 def main():
     """Entry point for chroot creator"""

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([bundle-chroot-builder],[1.03],[tudor.marcu@intel.com],[bundle-chroot-builder])
+AC_INIT([bundle-chroot-builder],[1.06],[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)