From 4afc571314e86867311472f5646cae6a38226a4c Mon Sep 17 00:00:00 2001
From: "Cody A.W. Somerville" <cody.somerville@canonical.com>
Date: Fri, 17 Apr 2009 10:23:38 +0200
Subject: Adding lpia support.

---
 functions/architecture.sh | 10 ++++++++--
 functions/defaults.sh     | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'functions')

diff --git a/functions/architecture.sh b/functions/architecture.sh
index cd8e073a8..278ec6a6f 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -38,8 +38,8 @@ Check_crossarchitecture ()
 	fi
 
 	case "${HOST}" in
-		amd64|i386|x86_64)
-			CROSS="amd64 i386"
+		amd64|i386|lpia|x86_64)
+			CROSS="amd64 i386 lpia"
 			;;
 
 		powerpc|ppc64)
@@ -75,6 +75,12 @@ Check_multiarchitecture ()
 					DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
 					;;
 
+				lpia)
+					DESTDIR="${DESTDIR}.lpi"
+					DESTDIR_LIVE="${DESTDIR_LIVE}.lpi"
+					DESTDIR_INSTALL="${DESTDIR_INSTALL}.lpi"
+					;;
+
 				powerpc)
 					DESTDIR="${DESTDIR}.ppc"
 					DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 680e57c66..5f5deef16 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -518,6 +518,19 @@ Set_defaults ()
 				LH_LINUX_FLAVOURS="itanium"
 				;;
 
+			lpia)
+				case "${LH_MODE}" in
+					debian|debian-release|embedian)
+						Echo_error "Architecture ${LH_ARCHITECTURE} not supported on ${LH_MODE}."
+						exit 1
+						;;
+
+					*)
+						LH_LINUX_FLAVOURS="lpia"
+						;;
+				esac
+				;;
+
 			powerpc)
 				case "${LIST}" in
 					stripped|minimal)
@@ -534,6 +547,7 @@ Set_defaults ()
 				case "${LH_MODE}" in
 					ubuntu)
 						Echo_error "Architecture ${LH_ARCHITECTURE} not supported on Ubuntu."
+						exit 1
 						;;
 
 					*)
@@ -558,6 +572,7 @@ Set_defaults ()
 
 			*)
 				Echo_error "Architecture ${LH_ARCHITECTURE} not yet supported (FIXME)"
+				exit 1
 				;;
 		esac
 	fi
@@ -694,7 +709,7 @@ Set_defaults ()
 	if [ -z "${LH_BOOTLOADER}" ]
 	then
 		case "${LH_ARCHITECTURE}" in
-			amd64|i386)
+			amd64|i386|lpia)
 				LH_BOOTLOADER="syslinux"
 				;;
 
@@ -854,7 +869,7 @@ Set_defaults ()
 
 	# Setting win32-loader option
 	case "${LH_ARCHITECTURE}" in
-		amd64|i386)
+		amd64|i386|lpia)
 			if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
 			then
 				LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}"
-- 
cgit v1.2.3