mirror of
https://github.com/clearlinux/bundle-chroot-builder.git
synced 2026-08-19 20:16:40 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b44cd8c2c6 | |||
| 8468405d9a | |||
| 2024792039 | |||
| 4afdbd6c8e |
@@ -249,7 +249,16 @@ def create_chroots(args, state_dir, bundles, yum_conf):
|
|||||||
|
|
||||||
out_dir = state_dir + "/image/" + out_version
|
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")
|
print("using dnf instead of yum")
|
||||||
packager = ["dnf"]
|
packager = ["dnf"]
|
||||||
else:
|
else:
|
||||||
@@ -300,7 +309,7 @@ def create_chroots(args, state_dir, bundles, yum_conf):
|
|||||||
|
|
||||||
print("Noting os-core package list")
|
print("Noting os-core package list")
|
||||||
with open(out_dir + "/versions", "w") as file:
|
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:
|
with open(out_dir + "/packages-os-core", "w") as file:
|
||||||
subprocess.Popen(['rpm', '--root={}/os-core'.format(out_dir),
|
subprocess.Popen(['rpm', '--root={}/os-core'.format(out_dir),
|
||||||
'-qa', '--queryformat', '%{NAME}\t%{SOURCERPM}\n'], stdout=file).wait()
|
'-qa', '--queryformat', '%{NAME}\t%{SOURCERPM}\n'], stdout=file).wait()
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
AC_PREREQ([2.68])
|
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])
|
AM_INIT_AUTOMAKE([foreign silent-rules color-tests no-dist-gzip dist-xz])
|
||||||
AC_CONFIG_FILES(Makefile)
|
AC_CONFIG_FILES(Makefile)
|
||||||
AC_PREFIX_DEFAULT(/usr/local)
|
AC_PREFIX_DEFAULT(/usr/local)
|
||||||
|
|||||||
Reference in New Issue
Block a user