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

Patch for mips miniiso



The attached patch corrects the parameters sent to genisovh[1] in mips's
build_miniiso target.  After doing so, the image is bootable and appears
to be installing normally.

genisovh is still unpackaged - the path I'm calling it from certainly
won't work for anyone else.  The only obvious difficulty for packaging
is its lack of a copyright statement, which I'm sure Florian Lohoff (its
author) could correct rapidly.

[1] http://www.silicon-verl.de/home/flo/software/genisovh-0.1.tgz


-- 
Nicholas Breen
nbreen@ofb.net
diff -Nru build_20040308/config/mips/miniiso.cfg build/config/mips/miniiso.cfg
--- build_20040308/config/mips/miniiso.cfg	2004-02-13 07:52:25.000000000 -0500
+++ build/config/mips/miniiso.cfg	2004-03-09 14:45:09.000000000 -0500
@@ -20,13 +20,15 @@
 	install -m 644 -D $(BASE_TMP)r4k-ip22/netboot/boot.img $(TEMP_CD_TREE)/install/r4k-ip22-boot.img
 	install -m 644 -D $(BASE_TMP)r5k-ip22/netboot/boot.img $(TEMP_CD_TREE)/install/r5k-ip22-boot.img
 	mkisofs -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
-# Commented out for now, genisovh needs to be packaged first.
-#	set -e; \
-#	ISOVH_BOOTFILES= ; \
-#	$(foreach SUB,r4k-ip22 r5k-ip22, \
-#		start=$$(isoinfo -i $(TEMP_MINIISO) -lsR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$10}'); \
-#		size=$$(isoinfo -i $(TEMP_MINIISO) -lsR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$5}'); \
-#		ISOVH_BOOTFILES="$$ISOVH_BOOTFILES $(SUB):$$start,$$size";) \
-#	../../genisovh-0.1/genisovh $(TEMP_MINIISO) $$ISOVH_BOOTFILES
+
+	set -e; \
+	ISOVH_BOOTFILES= ; \
+	$(foreach SUB,r4k-ip22 r5k-ip22, \
+		start=$$(isoinfo -i $(TEMP_MINIISO) -lR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$10}'); \
+		start=`echo $$[ 4 * $$start ]`; \
+		size=$$(isoinfo -i $(TEMP_MINIISO) -lR |grep -A 10 'Directory listing of /install' |grep $(SUB)-boot.img |awk '{print $$5}'); \
+		ISOVH_BOOTFILES="$$ISOVH_BOOTFILES $(SUB):$$start,$$size";) \
+	# not a permanent path for genisovh!
+	~/src/genisovh-0.1/genisovh $(TEMP_MINIISO) $$ISOVH_BOOTFILES
 
 arch_boot_screens:

Reply to: