From 827d039ebfb172c0a88509aed36a1ee9beb6b2a8 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Tue, 1 Jul 2014 01:55:27 -0700
Subject: [PATCH] support for ubuntu 14.04 for p8le

---
 xCAT-server/lib/xcat/plugins/debian.pm            |  4 ++++
 .../ubuntu/compute.ubuntu14.04.ppc64el.pkglist    | 15 +++++++++++++++
 xCAT-server/share/xcat/netboot/ubuntu/genimage    | 10 ++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64el.pkglist

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index c7a5ac399..172110599 100644
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -277,6 +277,10 @@ sub copycd
     {
         $darch = "x86";
     }
+    elsif ($darch and $darch =~ /ppc64el/)
+    {
+        $darch = "ppc64el";
+    }
     elsif ($darch and $darch =~ /ppc/)
     {
         $darch = "ppc64";
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64el.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64el.pkglist
new file mode 100644
index 000000000..818b8f26f
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.ppc64el.pkglist
@@ -0,0 +1,15 @@
+bash
+nfs-common
+openssl
+isc-dhcp-client
+libc-bin
+linux-image-generic
+openssh-server
+openssh-client
+wget
+vim
+ntp
+rsync
+busybox-static
+gawk
+dnsutils
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index 4b2868e81..8451ccc93 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -175,6 +175,8 @@ if ($netdriver) {
 } else {
     if ($arch eq 'x86' or $arch eq 'x86_64') {
         @ndrivers = qw/tg3 bnx2 bnx2x e1000 e1000e igb mlx_en virtio_net/;
+    } elsif ($arch eq 'ppc64el') {
+        @ndrivers = qw/bnx2 bnx2x e1000 e1000e igb/;
     } elsif ($arch eq 'ppc64') {
         @ndrivers = qw/e1000 e1000e igb ibmveth ehea/;
     } elsif ($arch eq 's390x') {   
@@ -242,8 +244,12 @@ unless ($onlyinitrd) {
    my $aptcachecmd = "chroot $rootimg_dir apt-get update && chroot $rootimg_dir apt-cache $non_interactive ";
    my $aptcmd1 = "debootstrap";
    #my $aptcmd2 = "--arch $uarch $dist $rootimg_dir file://$installroot/$osver/$arch/";
-   my $aptcmd2 = "--verbose  --arch $uarch $dist $rootimg_dir http://archive.ubuntu.com/ubuntu/";
-   
+   my $aptcmd2;
+   if ($uarch eq 'ppc64el') {
+       $aptcmd2 = "--verbose --arch $uarch $dist $rootimg_dir http://ports.ubuntu.com/ubuntu-ports/";
+   } else {
+       $aptcmd2 = "--verbose  --arch $uarch $dist $rootimg_dir http://archive.ubuntu.com/ubuntu/";
+   }
    mkpath("$rootimg_dir/var/lib/dpkg");
    mkpath("$rootimg_dir/var/lib/apt");