pungi for RHEL 7

[Connie Sieh]

On Thu, 18 Dec 2014, Dennis Gilmore wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On Thu, 18 Dec 2014 10:20:50 -0600
> Connie Sieh <csieh at fnal.gov> wrote:
>
>> The pungi in git is clearly for Fedora.  It can however be used for
>> RHEL 7 but a few "patches" are needed for it to work.
>>
>> How would the patches best be put in pungi?  There can be individual
>> command line options added that enable/disable features.  A example
>> of this is there is no hfs support in RHEL 7 so a "nomacboot" command
>> line option could be added to disable this.  Another option is a
>> single "rhel7" option that could cover all the rhel 7 patches.  Which
>> way would be best?
>>
>>
>
> The best way would be to add flags for the individual features.
>
> Dennis
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
>

I have attached a patch for pungi 3.12.1 that provides a option 
"nomacboot".  This command line option tells pungi to not include macboot 
in the compose.  This is needed for EL7 as it does not provide HFS.  The 
default has not been changed.

-- 
Connie J. Sieh
Computing Services Specialist III

Fermi National Accelerator Laboratory
630 840 8531 office

http://www.fnal.gov
csieh at fnal.gov
-------------- next part --------------
From root at compose-7.fnal.gov Mon Dec 22 14:07:25 2014
Date: Mon, 22 Dec 2014 14:07:24 -0600
From: root <root at compose-7.fnal.gov>
To: csieh at fnal.gov

diff --git a/src/bin/pungi.py b/src/bin/pungi.py
index 954a706..99e4570 100755
--- a/src/bin/pungi.py
+++ b/src/bin/pungi.py
@@ -108,6 +108,8 @@ def main():
         config.set('pungi', 'lookaside_repos', " ".join(opts.lookaside_repos))
     if opts.no_dvd:
         config.set('pungi', 'no_dvd', "True")
+    if opts.nomacboot:
+        config.set('pungi', 'nomacboot', "True")
     config.set("pungi", "fulltree", str(bool(opts.fulltree)))
     config.set("pungi", "selfhosting", str(bool(opts.selfhosting)))
     config.set("pungi", "nosource", str(bool(opts.nosource)))
@@ -289,6 +291,7 @@ if __name__ == '__main__':
         parser.add_option("--relnotefilere", dest="relnotefilere", type="string",
           action="callback", callback=set_config, callback_args=(config, ),
           help='Which files are the release notes -- GPL EULA')
+        parser.add_option("--nomacboot", action="store_true", dest="nomacboot",           help='disable setting up macboot as no hfs support ')
 
 
         (opts, args) = parser.parse_args()
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index b4fe2c8..c1318ce 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -1401,7 +1401,10 @@ class Pungi(pypungi.PungiBase):
 
         # Only supported mac hardware is x86 make sure we only enable mac support on arches that need it
         if self.tree_arch in ['x86_64']:
-            domacboot = True
+            if self.config.getboolean('pungi','nomacboot'):
+                   domacboot = False
+            else:
+                   domacboot = True
         else:
             domacboot = False
 
diff --git a/src/pypungi/config.py b/src/pypungi/config.py
index 8856857..617ae18 100644
--- a/src/pypungi/config.py
+++ b/src/pypungi/config.py
@@ -53,3 +53,4 @@ class Config(SafeConfigParser):
         self.set('pungi', 'lookaside_repos', '')
         self.set('pungi', 'resolve_deps', "True")
         self.set('pungi', 'no_dvd', "False")
+        self.set('pungi', 'nomacboot', "False")