[Debian-live-changes] r2436 - in dists/trunk/live-helper: docs functions helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jul 9 10:17:23 UTC 2007
Author: daniel
Date: 2007-07-09 10:17:23 +0000 (Mon, 09 Jul 2007)
New Revision: 2436
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/functions/architecture.sh
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_linux-image
dists/trunk/live-helper/helpers/lh_binary_memtest
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_binary_yaboot
Log:
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-07-09 10:17:23 UTC (rev 2436)
@@ -1,3 +1,10 @@
+2007-07-09 Daniel Baumann <daniel at debian.org>
+
+ * functions/architecture.sh, helpers/lh_binary_debian-installer,
+ lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
+ lh_binary_syslinux, lh_binary_yaboot:
+ - Simplified multi-arch checks/overrides.
+
2007-07-07 Daniel Baumann <daniel at debian.org>
* helpers/lh_binary_chroot:
Modified: dists/trunk/live-helper/functions/architecture.sh
===================================================================
--- dists/trunk/live-helper/functions/architecture.sh 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/functions/architecture.sh 2007-07-09 10:17:23 UTC (rev 2436)
@@ -1,7 +1,7 @@
#!/bin/sh
# architecture.sh - handle architecture specific support
-# Copyright (C) 2007 Otavio Salvador <otavio at debian.org>
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
# This is free software, and you are welcome to redistribute it
@@ -16,7 +16,7 @@
for ARCHITECTURE in ${ARCHITECTURES}
do
- if [ "${ARCHITECTURE}" = "${LIVE_ARCHITECTURE}" ]
+ if [ "`echo ${LIVE_ARCHITECTURE} | grep ${ARCHITECTURE}`" ]
then
VALID="true"
break
@@ -29,3 +29,34 @@
exit 0
fi
}
+
+Check_multiarchitecture ()
+{
+ if [ "`echo ${LIVE_ARCHITECTURE} | wc -w`" -gt "1" ]
+ then
+ # First, only support multiarch on iso
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+ then
+ # Assemble multi-arch
+ case "${LIVE_CURRENT_ARCHITECTURE}" in
+ amd64)
+ DESTDIR="${DESTDIR}.amd"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+ ;;
+
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+ ;;
+
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
+ ;;
+ esac
+ fi
+ fi
+}
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-07-09 10:17:23 UTC (rev 2436)
@@ -95,28 +95,8 @@
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
+Check_multiarchitecture
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
-
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
- fi
-fi
-
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
DESTDIR_DI="${DESTDIR}"
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-07-09 10:17:23 UTC (rev 2436)
@@ -125,26 +125,8 @@
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
- ;;
+Check_multiarchitecture
- i386)
- DESTDIR_LIVE="${DESTDIR_LIVE}.386"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
- ;;
- esac
- fi
-fi
-
# Creating directory
mkdir -p "${DESTDIR_LIVE}"
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-09 10:17:23 UTC (rev 2436)
@@ -89,28 +89,8 @@
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
+Check_multiarchitecture
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
-
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
- fi
-fi
-
# Creating directory
mkdir -p "${DESTDIR}"
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-07-09 10:17:23 UTC (rev 2436)
@@ -108,24 +108,8 @@
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
+Check_multiarchitecture
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
- fi
-fi
-
# Creating directory
mkdir -p "${DESTDIR}"
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-07-09 10:17:23 UTC (rev 2436)
@@ -162,26 +162,8 @@
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assembling multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
- ;;
+Check_multiarchitecture
- i386)
- DESTDIR_LIVE="${DESTDIR_LIVE}.386"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
- ;;
- esac
- fi
-fi
-
# Creating directory
mkdir -p "${DESTDIR_LIVE}"
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-07-09 09:03:46 UTC (rev 2435)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-07-09 10:17:23 UTC (rev 2436)
@@ -133,20 +133,7 @@
;;
esac
-# Temporary check for broken syslinux FIXME
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assembling multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- powerpc)
- DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
- ;;
- esac
- fi
-fi
+Check_multiarchitecture
# Creating directory
mkdir -p "${DESTDIR_LIVE}"
More information about the Debian-live-changes
mailing list