remove old patches
This commit is contained in:
parent
8ffc69450c
commit
42f4b042bf
@ -1,28 +0,0 @@
|
||||
From 4b5b59bd507def6077a4fac9f52af291527ded17 Mon Sep 17 00:00:00 2001
|
||||
From: Will Woods <wwoods@redhat.com>
|
||||
Date: Tue, 11 Oct 2011 15:03:52 -0400
|
||||
Subject: [PATCH 1/2] Fix DVD building on ppc64
|
||||
|
||||
ppc64 systems used to have arch == 'ppc', so pungi was only checking to
|
||||
see if arch == 'ppc'. Now that ppc64 is separate from ppc, we need to
|
||||
check if arch.startswith('ppc') instead.
|
||||
---
|
||||
src/pypungi/__init__.py | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
|
||||
index e183b9c..a402eb4 100644
|
||||
--- a/src/pypungi/__init__.py
|
||||
+++ b/src/pypungi/__init__.py
|
||||
@@ -1046,7 +1046,7 @@ class Pungi(pypungi.PungiBase):
|
||||
extraargs.extend(efibootargs)
|
||||
elif self.config.get('pungi', 'arch') == 'ia64':
|
||||
extraargs.extend(ia64bootargs)
|
||||
- elif self.config.get('pungi', 'arch') == 'ppc':
|
||||
+ elif self.config.get('pungi', 'arch').startswith('ppc'):
|
||||
extraargs.extend(ppcbootargs)
|
||||
extraargs.append(os.path.join(self.topdir, "ppc/mac"))
|
||||
elif self.config.get('pungi', 'arch') == 'sparc':
|
||||
--
|
||||
1.7.7
|
||||
|
@ -1,53 +0,0 @@
|
||||
From 45964282afc6a662d325df7955414d01803177dd Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Thu, 9 Feb 2012 09:12:55 -0600
|
||||
Subject: [PATCH] hash the Packages tree by default, adding a --nohash option
|
||||
for old style layout
|
||||
|
||||
---
|
||||
src/bin/pungi.py | 4 ++++
|
||||
src/pypungi/__init__.py | 6 +++++-
|
||||
2 files changed, 9 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/bin/pungi.py b/src/bin/pungi.py
|
||||
index 6455342..2fe5e7d 100755
|
||||
--- a/src/bin/pungi.py
|
||||
+++ b/src/bin/pungi.py
|
||||
@@ -81,6 +81,8 @@ def main():
|
||||
config.set('pungi', 'alldeps', "False")
|
||||
if opts.isfinal:
|
||||
config.set('pungi', 'isfinal', "True")
|
||||
+ if opts.nohash:
|
||||
+ config.set('pungi', 'nohash', "True")
|
||||
|
||||
# Actually do work.
|
||||
mypungi = pypungi.Pungi(config, ksparser)
|
||||
@@ -190,6 +192,8 @@ if __name__ == '__main__':
|
||||
help='Force reuse of an existing destination directory (will overwrite files)')
|
||||
parser.add_option("--isfinal", default=False, action="store_true",
|
||||
help='Specify this is a GA tree, which causes betanag to be turned off during install')
|
||||
+ parser.add_option("--nohash", default=False, action="store_true",
|
||||
+ help='disable hashing the Packages trees')
|
||||
|
||||
parser.add_option("-c", "--config", dest="config",
|
||||
help='Path to kickstart config file')
|
||||
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
|
||||
index 1ef3b8d..5d79fe7 100644
|
||||
--- a/src/pypungi/__init__.py
|
||||
+++ b/src/pypungi/__init__.py
|
||||
@@ -668,7 +668,11 @@ class Pungi(pypungi.PungiBase):
|
||||
basename = os.path.basename(po.relativepath)
|
||||
|
||||
local = po.localPkg()
|
||||
- target = os.path.join(pkgdir, basename)
|
||||
+ nohash = self.config.get('pungi', 'nohash')
|
||||
+ if nohash:
|
||||
+ target = os.path.join(pkgdir, basename)
|
||||
+ else:
|
||||
+ target = os.path.join(pkgdir, po.name[0].lower(), basename)
|
||||
|
||||
# Link downloaded package in (or link package from file repo)
|
||||
try:
|
||||
--
|
||||
1.7.7.6
|
||||
|
@ -1,37 +0,0 @@
|
||||
From b5297ce1c82c626bb3e51b7eb67ac5529e16a29b Mon Sep 17 00:00:00 2001
|
||||
From: Will Woods <wwoods@redhat.com>
|
||||
Date: Wed, 12 Oct 2011 20:25:20 -0400
|
||||
Subject: [PATCH 2/2] Use a predictable ISO Volume ID (#732298)
|
||||
|
||||
Since the new lorax branch needs to know the iso Volume ID to be able to
|
||||
boot, we need to make sure we're using the same Volume ID that lorax
|
||||
sets up the bootloaders to expect.
|
||||
---
|
||||
src/pypungi/__init__.py | 10 ++++------
|
||||
1 files changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
|
||||
index a402eb4..1ef3b8d 100644
|
||||
--- a/src/pypungi/__init__.py
|
||||
+++ b/src/pypungi/__init__.py
|
||||
@@ -1052,13 +1052,11 @@ class Pungi(pypungi.PungiBase):
|
||||
elif self.config.get('pungi', 'arch') == 'sparc':
|
||||
extraargs.extend(sparcbootargs)
|
||||
|
||||
+ # NOTE: if this doesn't match what's in the bootloader config, the
|
||||
+ # image won't be bootable!
|
||||
extraargs.append('-V')
|
||||
- if treesize > 700:
|
||||
- extraargs.append('%s %s %s DVD' % (self.config.get('pungi', 'name'),
|
||||
- self.config.get('pungi', 'version'), self.config.get('pungi', 'arch')))
|
||||
- else:
|
||||
- extraargs.append('%s %s %s' % (self.config.get('pungi', 'name'),
|
||||
- self.config.get('pungi', 'version'), self.config.get('pungi', 'arch')))
|
||||
+ extraargs.append('%s %s %s' % (self.config.get('pungi', 'name'),
|
||||
+ self.config.get('pungi', 'version'), self.config.get('pungi', 'arch')))
|
||||
|
||||
extraargs.extend(['-o', isofile])
|
||||
|
||||
--
|
||||
1.7.7
|
||||
|
@ -1,33 +0,0 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user