From 1ae3c67ba6726ffe3518215b45cc61fc51c9aba0 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Thu, 16 Jun 2022 23:25:17 -0700
Subject: [PATCH] have a working script

---
 iso/py/.sync-from-peridot.swp | Bin 0 -> 12288 bytes
 iso/py/build-iso              |  23 +++++++++++++++++++++++
 iso/py/configs/el8.yaml       |   2 ++
 iso/py/configs/el9-beta.yaml  |   2 ++
 iso/py/configs/el9.yaml       |   2 ++
 iso/py/configs/el9lh.yaml     |   2 ++
 iso/py/util/.dnf_utils.py.swp | Bin 0 -> 16384 bytes
 iso/py/util/iso_utils.py      |   2 +-
 8 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 iso/py/.sync-from-peridot.swp
 create mode 100644 iso/py/util/.dnf_utils.py.swp

diff --git a/iso/py/.sync-from-peridot.swp b/iso/py/.sync-from-peridot.swp
new file mode 100644
index 0000000000000000000000000000000000000000..ffca78d9b593c362f3c08739b5b7b98ec0195717
GIT binary patch
literal 12288
zcmeHNO^X~w7_N9Rends%LA_LFgqhX(h>2o?%wY*Adx%*~+{+S%n(msOa;mF3Rn@!9
zB_e`H!HY!jq@d`*gW_E;9`zvj13W20Ks<Sf_*8dK_kLv6$;m)9`_NNW??=_s@AD4B
z_T==|#zlH=aE9P|gpkGeA5Z4`9rDBP$BASUF8%z!T$U*@U@GC#>S-i(G~d-`K2Y54
zcf4K%945jItw@HEHhk!`mUB!9tB2WQXcsE#PmNCd88;%<2O{i`7e;}Bz`!aDoFHe<
zJa^iAv|Fd>V~@VRigU0H3<L%O1A&3SKwuy+5Euvy1P1PM23&TGyood1Q=Q|b>VE9N
zy&8sFU?4CM7zhjm1_A?tfxtjuATSUZ2n+-U0t0s;11u)wqk9SY{5Up`|Nk$4|Nr_h
zA-@2h0-pfy18)HWxCFckoC8h*e?3IVE#PP11K<YmHt;O)+X+Ix04(q#aO*)rz60I^
zwt=UCn-3rla1D3`co{ekJOw-n{CPhiKLOtY-vA#1?*i8W1zZB22c7_K-UmD229N_=
zzze|Rz#ll{kHFW!SHPEmKlf)qxB>%#fxtjuATSUZ_&+kh1}0bCHA2=1tuCpPgqxA!
zHkZy0%3-~#^ppu%uPQzE<6gZ!&80-h+Q5&;m}o3wv)F5Z;r{iE873ufa#)dOk~aZn
z%+7dRXDElwvYm@;j0m;Ca-uOYJkxlk(&mQOR(s|eLy;)FPdT<aH&J7{Z}yOJ%qMwL
zhplXj$;OnKXjYr}L9^udQ7`#Hvy`$obn{>gmz>!>yhK_}MbelXxx<X@5k^P!H3Yhh
z*Fd|ZO)qm5Q#a!&W%v+lx;tZz?{GsmXp(bl2{D6c#-sUohe;8S{RUAZ25~O<Y1^$r
z(=z3D$6Iu+!lXzEJ0oKex$R{UReQaP$Yoi<1kc%WGbnCIkyxZ?(@j5H?2eGig2jFd
zNuF}$x}AQ%tjJD}x<$rE)|s`VEX&G)C5xQUYSgjLKh7zWmUn!%4a&g6E;Bx*uoQp(
zNVyd%>0x!3DMvFMr%X|&>7>{hjro*88&qdL>QTv+?t5t*%I-|=lOJ(7ua`dbv7#GP
zbO&CgbXH8|<<y71R&?8=uN6H@3H3`6-kEP9zZG4Jnr@1$M`v7Sqt-e~T{s>&G>_Ji
zkI|nN`IZ&BboMf|0!6r>ilzVPUx@oQAujqR06iD$bc-8{8f^8b;n#9u&=;?uzI<)3
zOG)*VqIFe;3SE~)2k}8q#pl6#C9KUtjop~r$cUn@N3G5BZE@-wN6{-T=oI_++eR00
z%s857UaPc<J7JRr-h#bt_h|oz_R&7rKRV|-=o$Xib(%XNDZU9bvM#&X;gzyKmGhBK
zQ>~Uh&ydP_d30=)Uh$$YPfR0d90HI0mk;`*_MOr90m-R<f!<Qk?$t>VvzQnl!l_|y
S&2S>rkgFY<E!<42v*d4$IL?p&

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8b06bcb6e03e147e5cad08233eeb955f75641166
GIT binary patch
literal 16384
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
b_;K%y%ys!j2k$I(`MwAL0xI7f4aq+Nu3h%S

literal 0
HcmV?d00001

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']