QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pungi-3.03

Browse Source 
Based on fc20 package. Detailed changelog included in spec file.
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-08 01:05:12 +02:00
parent 85f2099230
commit 7fe06dd703
5 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pungi/disable-efi.patch
View File

@ -1,11 +1,11 @@
--- 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 @@
--- pungi-3.03/src/pypungi/__init__.py.orig 2013-12-07 23:25:33.790299986 +0100
+++ pungi-3.03/src/pypungi/__init__.py 2013-12-07 23:27:06.347452833 +0100
@@ -1528,7 +1528,8 @@
if self.config.get('pungi', 'arch') == 'i386' or self.config.get('pungi', 'arch') == 'x86_64':
if self.tree_arch == 'i386' or self.tree_arch == 'x86_64':
extraargs.extend(x86bootargs)
- if self.config.get('pungi', 'arch') == 'x86_64':
+ if self.config.get('pungi', 'arch') == 'x86_64' and \
- if self.tree_arch == 'x86_64':
+ if self.tree_arch == 'x86_64' and \
+ os.path.exists(os.path.join(self.topdir, 'images', 'efiboot.img')):
extraargs.extend(efibootargs)
isohybrid.append('-u')

BIN
pungi/pungi-2.13.tar.bz2
View File

Binary file not shown.

BIN
pungi/pungi-3.03.tar.bz2 Normal file
View File

Binary file not shown.

40
pungi/pungi.spec
View File

@ -5,7 +5,7 @@
%endif
Name: pungi
Version: 2.13
Version: 3.03
Release: 1.3%{?dist}
Summary: Distribution compose tool
@ -16,7 +16,7 @@ Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name
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: yum => 3.4.3-28, repoview, createrepo >= 0.4.11
Requires: lorax
BuildRequires: python-devel
@ -64,6 +64,42 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Oct 31 2013 Dennis Gilmore <dennis@ausil.us> - 3.03-1
- revert to the old way of doing versioning as the change in 3.01 did not work
* Thu Oct 31 2013 Dennis Gilmore <dennis@ausil.us> - 3.02-1
- fix typo in call to __version__ (Dennis Gilmore)
* Sun Oct 27 2013 Daniel Mach <dmach@redhat.com> - 3.01-1
- Add 'make log' command to print changelog for spec. (Daniel Mach)
- Implement %prepopulate config section as an additional package input. (Daniel Mach)
- Don't automatically apply fulltree on input multilib packages. (Daniel Mach)
- Implement %multilib-blacklist and %multilib-whitelist config sections. (Daniel Mach)
- Turn off fulltree for multilib packages. (Daniel Mach)
- Return package flags: input, fulltree-exclude, langpack, multilib, fulltree (Daniel Mach)
- Exclude srpms from conditional deps. (Daniel Mach)
- Improve greedy methods: none, all, build. (Daniel Mach)
- Add .gitignore. (Daniel Mach)
- Add 'yaboot' multilib method. (Daniel Mach)
- Drop pulseaudio-utils from runtime whitelist (Daniel Mach)
- Remove packages which are in lookaside repos from regular repos. (Daniel Mach)
- Print repoid to make clear from which repo a package came. (Daniel Mach)
- Don't pull conditional deps in when --nodeps is used. (Daniel Mach)
- Multilib fix - consider only *.so* libs which are also listed in Provides. (Daniel Mach)
- Fix --nodeps by setting Pungi.is_resolve_deps according to config. (Daniel Mach)
- Add test_arch.py. (Daniel Mach)
* Tue Aug 20 2013 Dennis Gilmore <dennis@ausil.us> - 3.00-1
- apply patches from Daniel Mach
- make sure we only use mac support on x86_64
- make sure deltarpm is disabled
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Dec 21 2012 Dennis Gilmore <dennis@ausil.us> - 2.13-1
- strip groups from comps not listed in the kickstart
- fix ppc64 runtime installation (#888887)

28
pungi/support-verify-downloaded-packages.patch
View File

@ -4,20 +4,20 @@ Especially important for lorax - they will not verified in any way without
setting yum options here.
Signed-off-by: Marek Marczykowski <marmarek@invisiblethingslab.com>
Index: pungi-2.13/src/pypungi/__init__.py
Index: pungi-3.03/src/pypungi/__init__.py
===================================================================
--- pungi-2.13.orig/src/pypungi/__init__.py
+++ pungi-2.13/src/pypungi/__init__.py
@@ -145,7 +145,7 @@ class Pungi(pypungi.PungiBase):
--- pungi-3.03.orig/src/pypungi/__init__.py
+++ pungi-3.03/src/pypungi/__init__.py
@@ -242,7 +242,7 @@
def _add_yum_repo(self, name, url, mirrorlist=False, groups=True,
cost=1000, includepkgs=[], excludepkgs=[],
cost=1000, includepkgs=None, excludepkgs=None,
- proxy=None):
+ proxy=None, gpgkey=None):
"""This function adds a repo to the yum object.
name: Name of the repo
@@ -189,6 +189,10 @@ class Pungi(pypungi.PungiBase):
url: Full url to the repo
@@ -279,6 +279,10 @@
thisrepo.exclude = excludepkgs
thisrepo.includepkgs = includepkgs
thisrepo.cost = cost
@ -28,15 +28,15 @@ Index: pungi-2.13/src/pypungi/__init__.py
# Yum doesn't like proxy being None
if proxy:
thisrepo.proxy = proxy
@@ -219,6 +223,7 @@ class Pungi(pypungi.PungiBase):
@@ -309,6 +313,7 @@
yumconf.installroot = os.path.join(self.workdir, 'yumroot')
yumconf.uid = os.geteuid()
yumconf.cache = 0
+ yumconf.assumeyes = True
yumconf.failovermethod = 'priority'
yumconf.deltarpm = 0
yumvars = yum.config._getEnvVar()
yumvars['releasever'] = self.config.get('pungi', 'version')
@@ -277,7 +282,8 @@ class Pungi(pypungi.PungiBase):
@@ -339,7 +344,8 @@
cost=repo.cost,
includepkgs=repo.includepkgs,
excludepkgs=repo.excludepkgs,
@ -46,13 +46,13 @@ Index: pungi-2.13/src/pypungi/__init__.py
else:
self._add_yum_repo(repo.name, repo.baseurl,
mirrorlist=False,
@@ -285,7 +291,8 @@ class Pungi(pypungi.PungiBase):
@@ -347,7 +353,8 @@
cost=repo.cost,
includepkgs=repo.includepkgs,
excludepkgs=repo.excludepkgs,
- proxy=repo.proxy)
+ proxy=repo.proxy,
+ gpgkey=repo.gpgkey)
self.logger.info('Getting sacks for arches %s' % arches)
self.ayum._getSacks(archlist=arches)
self.logger.info('Getting sacks for arches %s' % self.valid_arches)
self.ayum._getSacks(archlist=self.valid_arches)