From c3834287275f9929c136e652c0de7aa3e5b673b2 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Mon, 26 Jun 2017 13:13:25 +1000
Subject: [PATCH] As far as block-device layout is concerned ppc64le == ppc64el

Change-Id: I06a89f256f66eba2f73dd110f5d8a61e0f0a924c
---
 diskimage_builder/lib/common-functions | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/diskimage_builder/lib/common-functions b/diskimage_builder/lib/common-functions
index 4be4bb67..44499e8f 100644
--- a/diskimage_builder/lib/common-functions
+++ b/diskimage_builder/lib/common-functions
@@ -398,7 +398,14 @@ function block_device_create_config_file {
     for i in ${!image_elements[@]}; do
         local cfg
         # look for arch specific version first, then default
-        cfg=${image_elements[$i]}/block-device-${ARCH}.yaml
+        if [[ "ppc64le ppc64el" =~ $ARCH ]] ; then
+            # NOTE(tonyb): ppc64el and ppc64le are the same archttechture, it's
+            # just different distro's have different names.  So if we're either
+            # of them pick the block-device-ppc64el.yaml file
+            cfg=${image_elements[$i]}/block-device-ppc64el.yaml
+        else
+            cfg=${image_elements[$i]}/block-device-${ARCH}.yaml
+        fi
         if [ -e ${cfg} ]; then
             cp ${cfg} ${config_yaml}
             echo "Using block-device config: ${cfg}"