| |
@@ -73,13 +73,13 @@
|
| |
ci.compose.label = compose.compose_label
|
| |
|
| |
# product
|
| |
- ci.product.name = compose.conf["product_name"]
|
| |
- ci.product.version = compose.conf["product_version"]
|
| |
- ci.product.short = compose.conf["product_short"]
|
| |
- ci.product.is_layered = compose.conf.get("product_is_layered", False)
|
| |
+ ci.release.name = compose.conf["product_name"]
|
| |
+ ci.release.version = compose.conf["product_version"]
|
| |
+ ci.release.short = compose.conf["product_short"]
|
| |
+ ci.release.is_layered = compose.conf.get("product_is_layered", False)
|
| |
|
| |
# base product
|
| |
- if ci.product.is_layered:
|
| |
+ if ci.release.is_layered:
|
| |
ci.base_product.name = compose.conf["base_product_name"]
|
| |
ci.base_product.version = compose.conf["base_product_version"]
|
| |
ci.base_product.short = compose.conf["base_product_short"]
|
| |
@@ -99,38 +99,38 @@
|
| |
var.arches = set(variant.arches)
|
| |
|
| |
if var.type == "layered-product":
|
| |
- var.product.name = variant.product_name
|
| |
- var.product.short = variant.product_short
|
| |
- var.product.version = variant.product_version
|
| |
- var.product.is_layered = True
|
| |
+ var.release.name = variant.product_name
|
| |
+ var.release.short = variant.product_short
|
| |
+ var.release.version = variant.product_version
|
| |
+ var.release.is_layered = True
|
| |
|
| |
for arch in variant.arches:
|
| |
# paths: binaries
|
| |
- var.os_tree[arch] = relative_path(compose.paths.compose.os_tree(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.repository[arch] = relative_path(compose.paths.compose.repository(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.packages[arch] = relative_path(compose.paths.compose.packages(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.os_tree[arch] = relative_path(compose.paths.compose.os_tree(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.repository[arch] = relative_path(compose.paths.compose.repository(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.packages[arch] = relative_path(compose.paths.compose.packages(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
iso_dir = compose.paths.compose.iso_dir(arch=arch, variant=variant, create_dir=False) or ""
|
| |
if iso_dir and os.path.isdir(os.path.join(compose.paths.compose.topdir(), iso_dir)):
|
| |
- var.isos[arch] = relative_path(iso_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.isos[arch] = relative_path(iso_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
jigdo_dir = compose.paths.compose.jigdo_dir(arch=arch, variant=variant, create_dir=False) or ""
|
| |
if jigdo_dir and os.path.isdir(os.path.join(compose.paths.compose.topdir(), jigdo_dir)):
|
| |
- var.jigdos[arch] = relative_path(jigdo_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.jigdos[arch] = relative_path(jigdo_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
|
| |
# paths: sources
|
| |
- var.source_tree[arch] = relative_path(compose.paths.compose.os_tree(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.source_repository[arch] = relative_path(compose.paths.compose.repository(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.source_packages[arch] = relative_path(compose.paths.compose.packages(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.source_tree[arch] = relative_path(compose.paths.compose.os_tree(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.source_repository[arch] = relative_path(compose.paths.compose.repository(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.source_packages[arch] = relative_path(compose.paths.compose.packages(arch="source", variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
source_iso_dir = compose.paths.compose.iso_dir(arch="source", variant=variant, create_dir=False) or ""
|
| |
if source_iso_dir and os.path.isdir(os.path.join(compose.paths.compose.topdir(), source_iso_dir)):
|
| |
- var.source_isos[arch] = relative_path(source_iso_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.source_isos[arch] = relative_path(source_iso_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
source_jigdo_dir = compose.paths.compose.jigdo_dir(arch="source", variant=variant, create_dir=False) or ""
|
| |
if source_jigdo_dir and os.path.isdir(os.path.join(compose.paths.compose.topdir(), source_jigdo_dir)):
|
| |
- var.source_jigdos[arch] = relative_path(source_jigdo_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.source_jigdos[arch] = relative_path(source_jigdo_dir, compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
|
| |
# paths: debug
|
| |
- var.debug_tree[arch] = relative_path(compose.paths.compose.debug_tree(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.debug_repository[arch] = relative_path(compose.paths.compose.debug_repository(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
- var.debug_packages[arch] = relative_path(compose.paths.compose.debug_packages(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.debug_tree[arch] = relative_path(compose.paths.compose.debug_tree(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.debug_repository[arch] = relative_path(compose.paths.compose.debug_repository(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
+ var.paths.debug_packages[arch] = relative_path(compose.paths.compose.debug_packages(arch=arch, variant=variant, create_dir=False).rstrip("/") + "/", compose.paths.compose.topdir().rstrip("/") + "/").rstrip("/")
|
| |
'''
|
| |
# XXX: not suported (yet?)
|
| |
debug_iso_dir = compose.paths.compose.debug_iso_dir(arch=arch, variant=variant) or ""
|
| |
@@ -186,10 +186,10 @@
|
| |
|
| |
# product
|
| |
# TODO: read from variants.xml
|
| |
- ti.product.name = variant.product_name
|
| |
- ti.product.version = variant.product_version
|
| |
- ti.product.short = variant.product_short
|
| |
- ti.product.is_layered = True
|
| |
+ ti.release.name = variant.product_name
|
| |
+ ti.release.version = variant.product_version
|
| |
+ ti.release.short = variant.product_short
|
| |
+ ti.release.is_layered = True
|
| |
|
| |
# base product
|
| |
ti.base_product.name = compose.conf["product_name"]
|
| |
@@ -201,13 +201,13 @@
|
| |
ti.base_product.short = compose.conf["product_short"]
|
| |
else:
|
| |
# product
|
| |
- ti.product.name = compose.conf["product_name"]
|
| |
- ti.product.version = compose.conf["product_version"]
|
| |
- ti.product.short = compose.conf["product_short"]
|
| |
- ti.product.is_layered = compose.conf.get("product_is_layered", False)
|
| |
+ ti.release.name = compose.conf["product_name"]
|
| |
+ ti.release.version = compose.conf["product_version"]
|
| |
+ ti.release.short = compose.conf["product_short"]
|
| |
+ ti.release.is_layered = compose.conf.get("product_is_layered", False)
|
| |
|
| |
# base product
|
| |
- if ti.product.is_layered:
|
| |
+ if ti.release.is_layered:
|
| |
ti.base_product.name = compose.conf["base_product_name"]
|
| |
ti.base_product.version = compose.conf["base_product_version"]
|
| |
ti.base_product.short = compose.conf["base_product_short"]
|
| |
@@ -236,7 +236,7 @@
|
| |
ti.variants.add(var)
|
| |
|
| |
repomd_path = os.path.join(var.repository, "repodata", "repomd.xml")
|
| |
- ti.checksums.add(os_tree, repomd_path)
|
| |
+ ti.checksums.add(repomd_path, "sha256", os_tree)
|
| |
|
| |
for i in variant.get_variants(types=["addon"], arch=arch):
|
| |
addon = productmd.treeinfo.Variant(ti)
|
| |
@@ -251,17 +251,17 @@
|
| |
var.add(addon)
|
| |
|
| |
repomd_path = os.path.join(addon.repository, "repodata", "repomd.xml")
|
| |
- ti.checksums.add(os_tree, repomd_path)
|
| |
+ ti.checksums.add(repomd_path, "sha256", os_tree)
|
| |
|
| |
- class LoraxProduct(productmd.treeinfo.product.Product):
|
| |
+ class LoraxProduct(productmd.treeinfo.Release):
|
| |
def _check_short(self):
|
| |
# HACK: set self.short so .treeinfo produced by lorax can be read
|
| |
if not self.short:
|
| |
self.short = compose.conf["product_short"]
|
| |
|
| |
- class LoraxTreeInfo(productmd.TreeInfo):
|
| |
+ class LoraxTreeInfo(productmd.treeinfo.TreeInfo):
|
| |
def clear(self):
|
| |
- productmd.TreeInfo.clear(self)
|
| |
+ super(LoraxTreeInfo, self).clear()
|
| |
self.product = LoraxProduct(self)
|
| |
|
| |
# images
|
| |
@@ -277,12 +277,12 @@
|
| |
# stage2 - mainimage
|
| |
if bi_ti.stage2.mainimage:
|
| |
ti.stage2.mainimage = bi_ti.stage2.mainimage
|
| |
- ti.checksums.add(os_tree, ti.stage2.mainimage)
|
| |
+ ti.checksums.add(ti.stage2.mainimage, "sha256", os_tree)
|
| |
|
| |
# stage2 - instimage
|
| |
if bi_ti.stage2.instimage:
|
| |
ti.stage2.instimage = bi_ti.stage2.instimage
|
| |
- ti.checksums.add(os_tree, ti.stage2.instimage)
|
| |
+ ti.checksums.add(ti.stage2.instimage, "sha256", os_tree)
|
| |
|
| |
# images
|
| |
for platform in bi_ti.images.images:
|
| |
@@ -290,7 +290,7 @@
|
| |
ti.tree.platforms.add(platform)
|
| |
for image, path in bi_ti.images.images[platform].items():
|
| |
ti.images.images[platform][image] = path
|
| |
- ti.checksums.add(os_tree, path)
|
| |
+ ti.checksums.add(path, "sha256", os_tree)
|
| |
|
| |
# add product.img to images-$arch
|
| |
product_img = os.path.join(os_tree, "images", "product.img")
|
| |
@@ -298,7 +298,7 @@
|
| |
if os.path.isfile(product_img):
|
| |
for platform in ti.images.images:
|
| |
ti.images.images[platform]["product.img"] = product_img_relpath
|
| |
- ti.checksums.add(os_tree, product_img_relpath)
|
| |
+ ti.checksums.add(product_img_relpath, "sha256", os_tree)
|
| |
|
| |
path = os.path.join(compose.paths.compose.os_tree(arch=arch, variant=variant), ".treeinfo")
|
| |
compose.log_info("Writing treeinfo: %s" % path)
|
| |