[lorax/f18] add patch fixing composing on ppc and arm

Dennis Gilmore ausil at fedoraproject.org
Fri Nov 23 04:38:46 UTC 2012 

commit 5006263038ba28413becadddb4171eb8a29ed672
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Nov 22 22:38:19 2012 -0600

    add patch fixing composing on ppc and arm
    
    - add patch to fix permissions of upgrade.img

 ...treebuilder-add-prefix-to-rebuild_initrds.patch |    2 +-
 ...builder-improve-findkernels-initrd-search.patch |    2 +-
 0003-build-fedup-upgrade.img.patch                 |    2 +-
 0004-make-templates-install-upgrade.img.patch      |    2 +-
 ...Add-the-fedup-plymouth-theme-if-available.patch |    2 +-
 ...ade-from-the-sparc-and-sysylinux-config-t.patch |    2 +-
 ...-need-to-use-kernel.upgrade-not-kernel.up.patch |   55 +++++++++++++
 ...initrd-to-install-the-upgrade.img-initram.patch |   84 ++++++++++++++++++++
 lorax.spec                                         |   10 ++-
 9 files changed, 154 insertions(+), 7 deletions(-)
---
diff --git a/0001-treebuilder-add-prefix-to-rebuild_initrds.patch b/0001-treebuilder-add-prefix-to-rebuild_initrds.patch
index 68105ef..42d2354 100644
--- a/0001-treebuilder-add-prefix-to-rebuild_initrds.patch
+++ b/0001-treebuilder-add-prefix-to-rebuild_initrds.patch
@@ -1,7 +1,7 @@
 From 88caf0bdb2fce8c5c2b0545be0bc13dd8bf5534e Mon Sep 17 00:00:00 2001
 From: Will Woods <wwoods at redhat.com>
 Date: Tue, 13 Nov 2012 01:33:14 -0500
-Subject: [PATCH 1/6] treebuilder: add 'prefix' to rebuild_initrds()
+Subject: [PATCH 1/8] treebuilder: add 'prefix' to rebuild_initrds()
 
 If 'prefix' is passed to rebuild_initrds(), it will build a *new*
 initramfs with a name like $PREFIX-$KERNELVER.img, rather than
diff --git a/0002-treebuilder-improve-findkernels-initrd-search.patch b/0002-treebuilder-improve-findkernels-initrd-search.patch
index a79fe3d..2589276 100644
--- a/0002-treebuilder-improve-findkernels-initrd-search.patch
+++ b/0002-treebuilder-improve-findkernels-initrd-search.patch
@@ -1,7 +1,7 @@
 From d11a97fec8efc57f1a6cb2f1bbb270dc67bf873a Mon Sep 17 00:00:00 2001
 From: Will Woods <wwoods at redhat.com>
 Date: Tue, 13 Nov 2012 01:33:15 -0500
-Subject: [PATCH 2/6] treebuilder: improve findkernels() initrd search
+Subject: [PATCH 2/8] treebuilder: improve findkernels() initrd search
 
 This makes findkernels() look for any image named something like:
 
diff --git a/0003-build-fedup-upgrade.img.patch b/0003-build-fedup-upgrade.img.patch
index 238bccb..1632804 100644
--- a/0003-build-fedup-upgrade.img.patch
+++ b/0003-build-fedup-upgrade.img.patch
@@ -1,7 +1,7 @@
 From f78b7e0b27da49e3465425e24eacf4e92594cba4 Mon Sep 17 00:00:00 2001
 From: Will Woods <wwoods at redhat.com>
 Date: Tue, 13 Nov 2012 01:33:16 -0500
-Subject: [PATCH 3/6] build fedup upgrade.img
+Subject: [PATCH 3/8] build fedup upgrade.img
 
 Use rebuild_initrds() with prefix='upgrade' to build upgrade.img with
 the fedup "system-upgrade" module(s) inside.
diff --git a/0004-make-templates-install-upgrade.img.patch b/0004-make-templates-install-upgrade.img.patch
index 296465f..6316068 100644
--- a/0004-make-templates-install-upgrade.img.patch
+++ b/0004-make-templates-install-upgrade.img.patch
@@ -1,7 +1,7 @@
 From 5df53dcbf2c1530beea9911594482b968639da2a Mon Sep 17 00:00:00 2001
 From: Will Woods <wwoods at redhat.com>
 Date: Tue, 13 Nov 2012 01:33:17 -0500
-Subject: [PATCH 4/6] make templates install upgrade.img
+Subject: [PATCH 4/8] make templates install upgrade.img
 
 ---
  share/arm.tmpl  | 12 ++++++++++--
diff --git a/0005-Add-the-fedup-plymouth-theme-if-available.patch b/0005-Add-the-fedup-plymouth-theme-if-available.patch
index 87bfc9b..b934b21 100644
--- a/0005-Add-the-fedup-plymouth-theme-if-available.patch
+++ b/0005-Add-the-fedup-plymouth-theme-if-available.patch
@@ -1,7 +1,7 @@
 From aa1775da338a93494ef952dfb355157e192a7724 Mon Sep 17 00:00:00 2001
 From: Will Woods <wwoods at redhat.com>
 Date: Tue, 13 Nov 2012 01:33:18 -0500
-Subject: [PATCH 5/6] Add the 'fedup' plymouth theme if available
+Subject: [PATCH 5/8] Add the 'fedup' plymouth theme if available
 
 ---
  src/pylorax/__init__.py | 10 +++++++++-
diff --git a/0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch b/0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch
index ee6733a..5d0b1c2 100644
--- a/0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch
+++ b/0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch
@@ -1,7 +1,7 @@
 From 27685cfb2fdab565a607d0a1e6355c607f1fcfc6 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis at ausil.us>
 Date: Tue, 20 Nov 2012 17:04:47 -0600
-Subject: [PATCH 6/6] remove upgrade from the sparc and sysylinux config
+Subject: [PATCH 6/8] remove upgrade from the sparc and sysylinux config
  templates
 
 ---
diff --git a/0007-ppc-and-arm-need-to-use-kernel.upgrade-not-kernel.up.patch b/0007-ppc-and-arm-need-to-use-kernel.upgrade-not-kernel.up.patch
new file mode 100644
index 0000000..925491e
--- /dev/null
+++ b/0007-ppc-and-arm-need-to-use-kernel.upgrade-not-kernel.up.patch
@@ -0,0 +1,55 @@
+From 0f5330c9a360389d11e4a9b140276ff680e2684d Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Wed, 21 Nov 2012 21:52:36 -0600
+Subject: [PATCH 7/8] ppc and arm need to use kernel.upgrade not
+ kernel.upgrader
+
+---
+ share/arm.tmpl | 8 ++++----
+ share/ppc.tmpl | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/share/arm.tmpl b/share/arm.tmpl
+index 6afadca..1083f63 100644
+--- a/share/arm.tmpl
++++ b/share/arm.tmpl
+@@ -32,8 +32,8 @@ mkdir ${KERNELDIR}
+         installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
+         installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+ 
+-        ## install upgrader image
+-        install ${kernel.upgrader.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
++        ## install upgrade image
++        install ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
+         treeinfo images-${kernel.flavor}-${basearch} upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
+ 
+         ## create U-Boot wrapped images
+@@ -59,8 +59,8 @@ mkdir ${KERNELDIR}
+         installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
+         installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ 
+-        ## install upgrader image
+-        install ${kernel.upgrader.img} ${KERNELDIR}/upgrade.img
++        ## install upgrade image
++        install ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
+         treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
+ 
+         ## create U-Boot wrapped images
+diff --git a/share/ppc.tmpl b/share/ppc.tmpl
+index 984f294..4d0e1fc 100644
+--- a/share/ppc.tmpl
++++ b/share/ppc.tmpl
+@@ -66,8 +66,8 @@ install ${configdir}/magic ${BOOTDIR}
+     installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
+     installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ 
+-    ## upgrader image
+-    install ${kernel.upgrader.path} ${KERNELDIR}/upgrade.img
++    ## upgrade image
++    install ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
+     treeinfo images-${kernel.arch} upgrade ${KERNELDIR}/upgrade.img
+ 
+     ## install arch-specific bootloader config
+-- 
+1.8.0
+
diff --git a/0008-use-installinitrd-to-install-the-upgrade.img-initram.patch b/0008-use-installinitrd-to-install-the-upgrade.img-initram.patch
new file mode 100644
index 0000000..63f00ee
--- /dev/null
+++ b/0008-use-installinitrd-to-install-the-upgrade.img-initram.patch
@@ -0,0 +1,84 @@
+From fdd04d4e7e081137c82d24c9ab69eef41a2d2117 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Thu, 22 Nov 2012 19:55:32 -0600
+Subject: [PATCH 8/8] use installinitrd to install the upgrade.img initramfs
+ so that we get correct permissions
+
+---
+ share/arm.tmpl  | 4 ++--
+ share/ppc.tmpl  | 2 +-
+ share/s390.tmpl | 2 +-
+ share/x86.tmpl  | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/share/arm.tmpl b/share/arm.tmpl
+index 1083f63..08d9254 100644
+--- a/share/arm.tmpl
++++ b/share/arm.tmpl
+@@ -33,7 +33,7 @@ mkdir ${KERNELDIR}
+         installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+ 
+         ## install upgrade image
+-        install ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
++        installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
+         treeinfo images-${kernel.flavor}-${basearch} upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
+ 
+         ## create U-Boot wrapped images
+@@ -60,7 +60,7 @@ mkdir ${KERNELDIR}
+         installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ 
+         ## install upgrade image
+-        install ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
++        installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
+         treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
+ 
+         ## create U-Boot wrapped images
+diff --git a/share/ppc.tmpl b/share/ppc.tmpl
+index 4d0e1fc..3eb4a89 100644
+--- a/share/ppc.tmpl
++++ b/share/ppc.tmpl
+@@ -67,7 +67,7 @@ install ${configdir}/magic ${BOOTDIR}
+     installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ 
+     ## upgrade image
+-    install ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
++    installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
+     treeinfo images-${kernel.arch} upgrade ${KERNELDIR}/upgrade.img
+ 
+     ## install arch-specific bootloader config
+diff --git a/share/s390.tmpl b/share/s390.tmpl
+index 3af81d4..dcd78d2 100644
+--- a/share/s390.tmpl
++++ b/share/s390.tmpl
+@@ -25,7 +25,7 @@ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/kernel.img
+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ 
+ ## upgrader image
+-install ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
++installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
+ treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
+ 
+ ## s390 needs some extra boot config
+diff --git a/share/x86.tmpl b/share/x86.tmpl
+index 92e01fc..de2ab89 100644
+--- a/share/x86.tmpl
++++ b/share/x86.tmpl
+@@ -34,13 +34,13 @@ mkdir ${KERNELDIR}
+         ## i386 PAE
+         installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
+         installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+-        install ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
++        installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
+         treeinfo images-xen upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
+     %else:
+         ## normal i386, x86_64
+         installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
+         installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+-        install ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
++        installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
+         treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
+     %endif
+ %endfor
+-- 
+1.8.0
+
diff --git a/lorax.spec b/lorax.spec
index 5b797ff..517c76a 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -2,7 +2,7 @@
 
 Name:           lorax
 Version:        18.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -59,6 +59,8 @@ Patch2: 0003-build-fedup-upgrade.img.patch
 Patch3: 0004-make-templates-install-upgrade.img.patch
 Patch4: 0005-Add-the-fedup-plymouth-theme-if-available.patch
 Patch5: 0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch
+Patch6: 0007-ppc-and-arm-need-to-use-kernel.upgrade-not-kernel.up.patch
+Patch7: 0008-use-installinitrd-to-install-the-upgrade.img-initram.patch
 
 %description
 Lorax is a tool for creating the anaconda install images.
@@ -75,6 +77,8 @@ Anaconda's image install feature.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -97,6 +101,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Fri Nov 23 2012 Dennis Gilmore <dennis at ausil.us> 18.22-5
+- add patch fixing composing on ppc and arm
+- add patch to fix permissions of upgrade.img
+
 * Tue Nov 20 2012 Dennis Gilmore <dennis at ausil.us> 18.22-4
 - add updated 0006 patch, media upgrades are unsupported remove all refereneces to upgrade

More information about the scm-commits mailing list