[febootstrap/el5/master] Another go at guessing what ppc uses.

Richard W.M. Jones rjones at fedoraproject.org
Sat Nov 6 11:03:13 UTC 2010


commit e24f86b3464421bfa12f7b650fd4da01cfe5259a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Nov 6 11:02:56 2010 +0000

    Another go at guessing what ppc uses.

 0003-Fix-elf-default-arch-for-ppc-and-ppc64.patch  |    4 ++--
 ...-arch-should-exit-with-an-error-if-it-fai.patch |    2 +-
 febootstrap.spec                                   |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/0003-Fix-elf-default-arch-for-ppc-and-ppc64.patch b/0003-Fix-elf-default-arch-for-ppc-and-ppc64.patch
index 86739d7..31b99ee 100644
--- a/0003-Fix-elf-default-arch-for-ppc-and-ppc64.patch
+++ b/0003-Fix-elf-default-arch-for-ppc-and-ppc64.patch
@@ -15,8 +15,8 @@ index 66cfbab..e1359fc 100755
      x86_64) echo "elf64-x86-64 i386" ;;
      s390) echo "elf32-s390 s390:31-bit" ;;
      s390x) echo "elf64-s390 s390:31-bit" ;;
-+    ppc) echo "elf32-ppc ppc" ;;
-+    ppc64) echo "elf64-ppc ppc" ;;
++    ppc) echo "elf32-ppc powerpc" ;;
++    ppc64) echo "elf64-ppc powerpc" ;;
      *)
          echo "This architecture is not recognized.  Please update helper/elf-default-arch."
  esac
diff --git a/0004-elf-default-arch-should-exit-with-an-error-if-it-fai.patch b/0004-elf-default-arch-should-exit-with-an-error-if-it-fai.patch
index bb1382c..6cd6435 100644
--- a/0004-elf-default-arch-should-exit-with-an-error-if-it-fai.patch
+++ b/0004-elf-default-arch-should-exit-with-an-error-if-it-fai.patch
@@ -12,7 +12,7 @@ index e1359fc..148911c 100755
 --- a/helper/elf-default-arch
 +++ b/helper/elf-default-arch
 @@ -28,4 +28,5 @@ case $(uname -m) in
-     ppc64) echo "elf64-ppc ppc" ;;
+     ppc64) echo "elf64-ppc powerpc" ;;
      *)
          echo "This architecture is not recognized.  Please update helper/elf-default-arch."
 +        exit 1
diff --git a/febootstrap.spec b/febootstrap.spec
index 260d99e..5b52eda 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     2.10
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://people.redhat.com/~rjones/febootstrap/
@@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Nov  6 2010 Richard Jones <rjones at redhat.com> - 2.10-3
+* Sat Nov  6 2010 Richard Jones <rjones at redhat.com> - 2.10-4
 - Various fixes for RHEL 5.
 
 * Sat Nov  6 2010 Richard Jones <rjones at redhat.com> - 2.10-1


More information about the scm-commits mailing list