Adding debian version 4.0~a1-1.debian/4.0_a1-1

1 files changed, 39 insertions, 78 deletions

diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index d804d7222..d9a277379 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -53,25 +53,12 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze)
-		Check_package chroot/usr/bin/genisoimage genisoimage
-
-		if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-		then
-			Check_package chroot/usr/bin/isohybrid syslinux
-		fi
-		;;
-
-	*)
-		Check_package chroot/usr/bin/xorriso xorriso
+Check_package chroot/usr/bin/genisoimage genisoimage
 
-		if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-		then
-			Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
-		fi
-		;;
-esac
+if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+then
+	Check_package chroot/usr/bin/isohybrid syslinux
+fi
 
 # Restoring cache
 Restore_cache cache/packages.binary
@@ -85,92 +72,79 @@ then
 	rm -f ${IMAGE}
 fi
 
-# Handle xorriso generic options
-XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
-
-# Handle xorriso live-build specific options
-case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze)
-		;;
-
-	*)
-		if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-		then
-			XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
-		fi
-		;;
-esac
+# Handle genisoimage generic options
+GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
 
+# Handle genisoimage live-build specific options
 if [ "${_QUIET}" = "true" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
 
 if [ "${_VERBOSE}" = "true" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
 fi
 
 if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
 fi
 
 if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
 fi
 
 if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
 fi
 
 if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
 fi
 
-# Handle xorriso architecture specific options
+# Handle genisoimage architecture specific options
 case "${LB_BOOTLOADER}" in
 	grub)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito"
-		XORRISO_EXCLUDE="boot/grub/stage2_eltorito"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
+		GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
 		;;
 
 	grub2)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/grub_eltorito -J"
-		XORRISO_EXCLUDE="boot/grub/grub_eltorito"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J"
+		GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito"
 		;;
 
 	silo)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
-		XORRISO_EXCLUDE="boot/isofs.b"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
+		GENISOIMAGE_EXCLUDE="boot/isofs.b"
 		;;
 
 	syslinux)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		case "${LB_MODE}" in
 			progress-linux)
-				XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
-				XORRISO_EXCLUDE="boot/boot.bin"
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
+				GENISOIMAGE_EXCLUDE="boot/boot.bin"
 				;;
 
 			*)
-				XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-				XORRISO_EXCLUDE="isolinux/isolinux.bin"
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
+				GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
 				;;
 		esac
-
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		;;
 
 	yaboot)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map"
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
-		XORRISO_EXCLUDE="yaboot/hfs.map"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+		GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
 		;;
 
 	*)
@@ -182,7 +156,7 @@ esac
 
 #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 #then
-#	XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
+#	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
 #fi
 
 if [ "${LB_BOOTLOADER}" = "grub2" ]
@@ -217,33 +191,20 @@ else
 	echo "#!/bin/sh" > binary.sh
 fi
 
-case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze)
-
 cat >> binary.sh << EOF
-genisoimage ${XORRISO_OPTIONS} -o ${IMAGE} binary
-EOF
-
-		if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-		then
 
-cat >> binary.sh << EOF
-
-isohybrid ${IMAGE}
+genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
 EOF
 
-		fi
-		;;
-
-	*)
+if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+then
 
 cat >> binary.sh << EOF
 
-xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary
+isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
 EOF
 
-		;;
-esac
+fi
 
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)