Merge branch 'master' of git://git.qubes-os.org/marmarek/installer-qubes-os

lorax-templates-qubes/lorax-templates-qubes.spec

@@ -3,7 +3,7 @@
 %endif
 
 Name:		lorax-templates-qubes
-Version:	1.2
+Version:	2.0
 Release:	1%{?dist}
 Summary:	Lorax templates for Qubes installation ISO
 

lorax-templates-qubes/templates/x86.tmpl

@@ -88,23 +88,23 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
     %endif
 %endif
 
-## WHeeeeeeee, EFI.
-## We could remove the basearch restriction someday..
-<% efiargs=""; efigraft=""; efihybrid="" %>
-%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386':
-    <%
-    efiarch = 'X64' if basearch=='x86_64' else 'IA32'
-    efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
-    images = ["images/efiboot.img"]
-    if domacboot:
-        images.append("images/macboot.img")
-    for img in images:
-        efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
-        efigraft += " {0}={1}/{0}".format(img,outroot)
-    efihybrid = "--uefi --mac" if domacboot else "--uefi"
-    %>
-    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
-%endif
+## ## WHeeeeeeee, EFI.
+## ## We could remove the basearch restriction someday..
+## <% efiargs=""; efigraft=""; efihybrid="" %>
+## %if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386':
+##     <%
+##     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
+##     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+##     images = ["images/efiboot.img"]
+##     if domacboot:
+##         images.append("images/macboot.img")
+##     for img in images:
+##         efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+##         efigraft += " {0}={1}/{0}".format(img,outroot)
+##     efihybrid = "--uefi --mac" if domacboot else "--uefi"
+##     %>
+##     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
+## %endif
 
 ## ## make boot.iso
 ## runcmd mkisofs -o ${outroot}/images/boot.iso \

pungi/disable-efi.patch

@@ -0,0 +1,12 @@
+--- pungi-2.13/src/pypungi/__init__.py.orig	2013-12-07 23:25:33.790299986 +0100
++++ pungi-2.13/src/pypungi/__init__.py	2013-12-07 23:27:06.347452833 +0100
+@@ -1143,7 +1143,8 @@
+ 
+         if self.config.get('pungi', 'arch') == 'i386' or self.config.get('pungi', 'arch') == 'x86_64':
+             extraargs.extend(x86bootargs)
+-            if self.config.get('pungi', 'arch') == 'x86_64':
++            if self.config.get('pungi', 'arch') == 'x86_64' and \
++                    os.path.exists(os.path.join(self.topdir, 'images', 'efiboot.img')):
+                 extraargs.extend(efibootargs)
+                 isohybrid.append('-u')
+                 if os.path.exists(os.path.join(self.topdir, 'images', 'macboot.img')):

pungi/pungi.spec

@@ -6,7 +6,7 @@
 
 Name:           pungi
 Version:        2.13
-Release:        1.2%{?dist}
+Release:        1.3%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -14,6 +14,7 @@ License:        GPLv2
 URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         support-verify-downloaded-packages.patch
+Patch1:         disable-efi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
 Requires:       lorax
@@ -29,6 +30,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build

qubes-release/qubes-dom0-r2-beta2.repo

@@ -1,7 +1,7 @@
 [qubes-dom0-r2b2-current]
 name = Qubes Dom0 Repository (updates)
 baseurl = http://yum.qubes-os.org/r$releasever-beta2/current/dom0
-enabled = 1
+enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary

qubes-release/qubes-release.spec

@@ -9,7 +9,7 @@
 Summary:	Qubes release files
 Name:		qubes-release
 Version:	%{dist_version}
-Release:	4
+Release:	5
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.bz2