From 4672fbb100657621fbfd07b5efa7c0bd312928d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:15:12 +0100 Subject: [PATCH 1/6] Disable r2-beta2 repo on r2-beta3 release --- qubes-release/qubes-dom0-r2-beta2.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubes-release/qubes-dom0-r2-beta2.repo b/qubes-release/qubes-dom0-r2-beta2.repo index 12c225e..72b5256 100644 --- a/qubes-release/qubes-dom0-r2-beta2.repo +++ b/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 From 23f94f0a1624da84a08affd03b7b3f791ae21512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:15:40 +0100 Subject: [PATCH 2/6] qubes-release-2-5 --- qubes-release/qubes-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec index 219fe53..2586eac 100644 --- a/qubes-release/qubes-release.spec +++ b/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 From eb2625db0b3861f4f7d91a1c8c515b0c2ae7eaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:16:05 +0100 Subject: [PATCH 3/6] pungi: Don't include EFI options if EFI image not generated --- pungi/disable-efi.patch | 12 ++++++++++++ pungi/pungi.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pungi/disable-efi.patch diff --git a/pungi/disable-efi.patch b/pungi/disable-efi.patch new file mode 100644 index 0000000..85c0495 --- /dev/null +++ b/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')): diff --git a/pungi/pungi.spec b/pungi/pungi.spec index d41cb3b..58dfcdb 100644 --- a/pungi/pungi.spec +++ b/pungi/pungi.spec @@ -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 From 7a46b7e7dc8f2c03b44331f387299dd4f64441d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:16:54 +0100 Subject: [PATCH 4/6] pungi-2.13-1.3 --- pungi/pungi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pungi/pungi.spec b/pungi/pungi.spec index 58dfcdb..17425a2 100644 --- a/pungi/pungi.spec +++ b/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 From b6ace0cd2fe11ee863c22f0f235230a12322a3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:17:42 +0100 Subject: [PATCH 5/6] lorax: don't build EFI image Qubes currently don't support EFI (because of xen 4.1) so do not include not working EFI boot image. --- lorax-templates-qubes/templates/x86.tmpl | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl index ebdc2f9..12f73bd 100644 --- a/lorax-templates-qubes/templates/x86.tmpl +++ b/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 \ From 23cdab605a40654a83ae565f53df1fb9040ff282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 8 Dec 2013 19:18:50 +0100 Subject: [PATCH 6/6] lorax-templates-qubes-2.0 --- lorax-templates-qubes/lorax-templates-qubes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lorax-templates-qubes/lorax-templates-qubes.spec b/lorax-templates-qubes/lorax-templates-qubes.spec index 3f6eda4..4bed934 100644 --- a/lorax-templates-qubes/lorax-templates-qubes.spec +++ b/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