add patch from will woods for yaboot on ppc
This commit is contained in:
parent
2859b66cf7
commit
040cd22fa6
33
hack-ppc-yaboot.patch
Normal file
33
hack-ppc-yaboot.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
blerg. yaboot freaks out if there's any slashes in its config, so we
|
||||||
|
can't boot anything with non-ascii characters in the volume name. So we
|
||||||
|
need to remove all non-ascii chars, and do it the same way lorax does
|
||||||
|
it.
|
||||||
|
|
||||||
|
This is why lorax and pungi shouldn't both be building bootable images.
|
||||||
|
---
|
||||||
|
src/pypungi/__init__.py | 9 +++++++--
|
||||||
|
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
|
||||||
|
index 1ef3b8d..dac76dd 100644
|
||||||
|
--- a/src/pypungi/__init__.py
|
||||||
|
+++ b/src/pypungi/__init__.py
|
||||||
|
@@ -1055,8 +1055,13 @@ class Pungi(pypungi.PungiBase):
|
||||||
|
# NOTE: if this doesn't match what's in the bootloader config, the
|
||||||
|
# image won't be bootable!
|
||||||
|
extraargs.append('-V')
|
||||||
|
- extraargs.append('%s %s %s' % (self.config.get('pungi', 'name'),
|
||||||
|
- self.config.get('pungi', 'version'), self.config.get('pungi', 'arch')))
|
||||||
|
+ cdlabel = '%s %s %s' % (self.config.get('pungi', 'name'),
|
||||||
|
+ self.config.get('pungi', 'version'),
|
||||||
|
+ self.config.get('pungi', 'arch'))
|
||||||
|
+ if self.config.get('pungi', 'arch').startswith('ppc'):
|
||||||
|
+ # special case for PPC, because yaboot is terrible
|
||||||
|
+ cdlabel = ''.join(ch if ch.isalnum() else '_' for ch in cdlabel)
|
||||||
|
+ extraargs.append(cdlabel)
|
||||||
|
|
||||||
|
extraargs.extend(['-o', isofile])
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.7.6
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: pungi
|
Name: pungi
|
||||||
Version: 2.9
|
Version: 2.9
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Distribution compose tool
|
Summary: Distribution compose tool
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -11,6 +11,7 @@ URL: https://fedorahosted.org/pungi
|
|||||||
Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
|
Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
|
||||||
Patch1: 0001-Fix-DVD-building-on-ppc64.patch
|
Patch1: 0001-Fix-DVD-building-on-ppc64.patch
|
||||||
Patch2: 0002-Use-a-predictable-ISO-Volume-ID-732298.patch
|
Patch2: 0002-Use-a-predictable-ISO-Volume-ID-732298.patch
|
||||||
|
PAtch3: hack-ppc-yaboot.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
|
Requires: anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
|
||||||
Requires: lorax
|
Requires: lorax
|
||||||
@ -26,6 +27,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 31 2012 Dennis Gilmore <dennis@ausil.us> - 2.9-2
|
||||||
|
- add patch from will woods for yaboot on ppc
|
||||||
|
|
||||||
* Mon Jan 30 2012 Dennis Gilmore <dennis@ausil.us> - 2.9-1
|
* Mon Jan 30 2012 Dennis Gilmore <dennis@ausil.us> - 2.9-1
|
||||||
- pass isfinal rather than is_beta to lorax
|
- pass isfinal rather than is_beta to lorax
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user