diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-02-18 17:34:29 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | c66942f06ed5dcebab29711afee6dcef8d865adf (patch) | |
| tree | 52a5557cfe76cc3cc7e386e5b9b52436832e0a94 /functions/architecture.sh | |
| parent | 9d6a4dedc2736389349345c29d3a8a48b7b70692 (diff) | |
| download | vyos-live-build-c66942f06ed5dcebab29711afee6dcef8d865adf.tar.gz vyos-live-build-c66942f06ed5dcebab29711afee6dcef8d865adf.zip | |
Reworking iso-hybrid as an independent binary image type.
Diffstat (limited to 'functions/architecture.sh')
| -rwxr-xr-x | functions/architecture.sh | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/functions/architecture.sh b/functions/architecture.sh index cd8e073a8..9f18ad47e 100755 --- a/functions/architecture.sh +++ b/functions/architecture.sh @@ -59,28 +59,29 @@ Check_multiarchitecture () if [ "$(echo ${LH_ARCHITECTURE} | wc -w)" -gt "1" ] then # First, only support multiarch on iso - if [ "${LH_BINARY_IMAGES}" = "iso" ] - then - # Assemble multi-arch - case "${LH_CURRENT_ARCHITECTURE}" in - amd64) - DESTDIR="${DESTDIR}.amd" - DESTDIR_LIVE="${DESTDIR_LIVE}.amd" - DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd" - ;; + case "${LH_BINARY_IMAGES}" in + iso*) + # Assemble multi-arch + case "${LH_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" - ;; + 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 + powerpc) + DESTDIR="${DESTDIR}.ppc" + DESTDIR_LIVE="${DESTDIR_LIVE}.ppc" + DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc" + ;; + esac + ;; + esac fi } |