Compare commits

...

4 Commits

Author SHA1 Message Date
Patrick McCarty b44cd8c2c6 Release v1.15
This release adds support for using DNF on Clear Linux.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-02-13 15:22:29 -08:00
Patrick McCarty 8468405d9a Add support for DNF on Clear Linux
DNF enablement was completed in Clear Linux builds > 20650, so
autodetect whether yum or DNF should be used for chroot creation when
running on Clear Linux.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-02-13 11:43:59 -08:00
Tudor Marcu 2024792039 Release v1.14
Suppress extra yum plugin output.

Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
2018-02-01 11:24:56 -08:00
George T Kramer 4afdbd6c8e Filter yum output for parsing with yum plugins
Dependeing if plugins are enabled when yum is directed to honor plugin
usage, the output from yum list changes, and has the potential to break
the creation of the versions file.  Suppressing this additional plugin
output by operating yum in quiet mode avoids this risk.

Signed-off-by: George T Kramer <george.t.kramer@intel.com>
2018-02-01 11:19:01 -08:00
2 changed files with 12 additions and 3 deletions
+11 -2
View File
@@ -249,7 +249,16 @@ def create_chroots(args, state_dir, bundles, yum_conf):
out_dir = state_dir + "/image/" + out_version
if platform.dist()[0] == "fedora" and int(platform.dist()[1]) >= 22:
try:
with open("/usr/share/clear/version", "r") as verfile:
clrver = int(verfile.read().strip())
except Exception:
clrver = None
if clrver and clrver > 20650:
print("using dnf on clr")
packager = ["dnf"]
elif platform.dist()[0] == "fedora" and int(platform.dist()[1]) >= 22:
print("using dnf instead of yum")
packager = ["dnf"]
else:
@@ -300,7 +309,7 @@ def create_chroots(args, state_dir, bundles, yum_conf):
print("Noting os-core package list")
with open(out_dir + "/versions", "w") as file:
subprocess.Popen(yum_cmd + ["--installroot={}/os-core".format(out_dir), "list"], stdout=file).wait()
subprocess.Popen(yum_cmd + ["--quiet", "--installroot={}/os-core".format(out_dir), "list"], stdout=file).wait()
with open(out_dir + "/packages-os-core", "w") as file:
subprocess.Popen(['rpm', '--root={}/os-core'.format(out_dir),
'-qa', '--queryformat', '%{NAME}\t%{SOURCERPM}\n'], stdout=file).wait()
+1 -1
View File
@@ -1,5 +1,5 @@
AC_PREREQ([2.68])
AC_INIT([bundle-chroot-builder],[1.13],[tudor.marcu@intel.com],[bundle-chroot-builder])
AC_INIT([bundle-chroot-builder],[1.15],[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)