[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] Add support for lpia arch



Cody A.W. Somerville wrote:
> I'd like to use live-helper to build images for lpia, I've created a small patch to fix this.

diff --git a/functions/architecture.sh b/functions/architecture.sh
index cd8e073..dedfdf7 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -74,7 +74,11 @@ Check_multiarchitecture ()
 					DESTDIR_LIVE="${DESTDIR_LIVE}.386"
 					DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
 					;;
-
+				lpia)
+					DESTDIR="${DESTDIR}.lpia"
+					DESTDIR_LIVE="${DESTDIR_LIVE}.lpia"
+					DESTDIR_INSTALL="${DESTDIR_INSTALL}.lpia"
+					;;					
 				powerpc)
 					DESTDIR="${DESTDIR}.ppc"
 					DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"

for legacy reasons, those directory names need to be 8.3; so .lpia
doesn't work.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 2b2e3f7..5bae552 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -447,7 +447,7 @@ Set_defaults ()
 				fi
 				;;

-			arm|armel|m68k)
+			arm|armel|m68k|lpia)
 				Echo_error "You need to specify the linux kernel flavour manually
on ${LH_ARCHITECTURE} (FIXME)."
 				exit 1
 				;;

are you sure about that? can't we give a sane default image here?

diff --git a/helpers/lh_binary_debian-installer
b/helpers/lh_binary_debian-installer
index 56f0b73..678adfc 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -118,7 +118,7 @@ esac

 # Varous architecture-specific hacks
 case "${LH_ARCHITECTURE}" in
-	i386|amd64)
+	i386|amd64|lpia)
 		case "${DI_IMAGE_TYPE}" in
 			netboot)
 				DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
@@ -278,7 +278,11 @@ then
 		i386)
 			URL="http://people.debian.org/~joeyh/d-i/images/daily/";
 			;;
-
+		
+		lpia)
+			URL="http://people.debian.org/~joeyh/d-i/images/daily/";
+			;;
+		

debian doesn't have lpia, so that doesn't make any sense.
rather; either lh_binary_debian-installer or lh_config should fail in
thsi situation. actually, it should be handled the same as the
unsupported archs in ubuntu from the ubuntu mode patch.

 		ia64)
 			URL="http://people.debian.org/~dannf/d-i/images/daily/";
 			;;

diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index f5abaab..6bae34f 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -60,7 +60,11 @@ case "${LH_ARCHITECTURE}" in
 	i386)
 		LINUX="vmlinuz"
 		;;
-
+	
+	lpia)
+		LINUX="vmlinuz"
+		;;
+	
 	powerpc)
 		LINUX="vmlinux"
 		;;

that would be i386|lpia) then, not an own stanza for lpia itself here.

rest looks ok, however, please have a look at it again now that the
ubuntu mode is included.

Regards,
Daniel

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/


Reply to: