diff --git a/iso/py/.sync-from-peridot.swp b/iso/py/.sync-from-peridot.swp new file mode 100644 index 0000000..ffca78d Binary files /dev/null and b/iso/py/.sync-from-peridot.swp differ diff --git a/iso/py/build-iso b/iso/py/build-iso index a8c6f34..428ce45 100755 --- a/iso/py/build-iso +++ b/iso/py/build-iso @@ -5,3 +5,26 @@ import argparse from common import * from util import Checks from util import IsoBuild + +parser = argparse.ArgumentParser(description="ISO Compose") + +parser.add_argument('--release', type=str, help="Major Release Version", required=True) +parser.add_argument('--isolation', type=str, help="mock isolation mode") +parser.add_argument('--rc', action='store_true', help="Release Candidate") +parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here") +parser.add_argument('--logger', type=str) +results = parser.parse_args() +rlvars = rldict[results.release] +major = rlvars['major'] + +a = IsoBuild( + rlvars, + config, + major=major, + rc=results.rc, + isolation=results.isolation, + compose_dir_is_here=results.local_compose, + logger=results.logger, +) + +a.run() diff --git a/iso/py/configs/el8.yaml b/iso/py/configs/el8.yaml index 93bcdf3..032a9de 100644 --- a/iso/py/configs/el8.yaml +++ b/iso/py/configs/el8.yaml @@ -3,6 +3,8 @@ fullname: 'Rocky Linux 8' revision: '8.6' rclvl: 'RC2' + major: '8' + minor: '6' allowed_arches: - x86_64 - aarch64 diff --git a/iso/py/configs/el9-beta.yaml b/iso/py/configs/el9-beta.yaml index 13eca3e..0303f67 100644 --- a/iso/py/configs/el9-beta.yaml +++ b/iso/py/configs/el9-beta.yaml @@ -3,6 +3,8 @@ fullname: 'Rocky Linux 9' revision: '9.1' rclvl: 'RC1' + major: '9' + minor: '1' bugurl: 'https://bugs.rockylinux.org' allowed_arches: - x86_64 diff --git a/iso/py/configs/el9.yaml b/iso/py/configs/el9.yaml index faacbdb..281d6f7 100644 --- a/iso/py/configs/el9.yaml +++ b/iso/py/configs/el9.yaml @@ -3,6 +3,8 @@ fullname: 'Rocky Linux 9' revision: '9.0' rclvl: 'RC1' + major: '9' + minor: '0' bugurl: 'https://bugs.rockylinux.org' allowed_arches: - x86_64 diff --git a/iso/py/configs/el9lh.yaml b/iso/py/configs/el9lh.yaml index 1aa3f54..853d96b 100644 --- a/iso/py/configs/el9lh.yaml +++ b/iso/py/configs/el9lh.yaml @@ -3,6 +3,8 @@ fullname: 'Rocky Linux 9' revision: '9.1' rclvl: 'RC1' + major: '9' + minor: '1' bugurl: 'https://bugs.rockylinux.org' allowed_arches: - x86_64 diff --git a/iso/py/util/.dnf_utils.py.swp b/iso/py/util/.dnf_utils.py.swp new file mode 100644 index 0000000..8b06bcb Binary files /dev/null and b/iso/py/util/.dnf_utils.py.swp differ diff --git a/iso/py/util/iso_utils.py b/iso/py/util/iso_utils.py index 286a6d9..d168fff 100644 --- a/iso/py/util/iso_utils.py +++ b/iso/py/util/iso_utils.py @@ -59,7 +59,7 @@ class IsoBuild: # Relevant major version items self.release = rlvars['revision'] - self.minor_version = rlvars['revision'].split('.')[1] + self.minor_version = rlvars['minor'] self.revision = rlvars['revision'] + "-" + rlvars['rclvl'] self.rclvl = rlvars['rclvl'] self.repos = rlvars['iso_map']['repos']