diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-12-09 21:54:41 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:03 +0100 |
| commit | 352d962ee88f559ee19ec57732665ef583221fd9 (patch) | |
| tree | b2c6db6bf054ec0fdf2cdce3af4f96c62a7f86ab /functions | |
| parent | 25c38a043ed102b7d636432425b4cc0aade6a156 (diff) | |
| download | vyos-live-build-352d962ee88f559ee19ec57732665ef583221fd9.tar.gz vyos-live-build-352d962ee88f559ee19ec57732665ef583221fd9.zip | |
Removing lpia support, this architecture is dead.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/architecture.sh | 10 | ||||
| -rwxr-xr-x | functions/defaults.sh | 17 |
2 files changed, 4 insertions, 23 deletions
diff --git a/functions/architecture.sh b/functions/architecture.sh index 278ec6a6f..cd8e073a8 100755 --- a/functions/architecture.sh +++ b/functions/architecture.sh @@ -38,8 +38,8 @@ Check_crossarchitecture () fi case "${HOST}" in - amd64|i386|lpia|x86_64) - CROSS="amd64 i386 lpia" + amd64|i386|x86_64) + CROSS="amd64 i386" ;; powerpc|ppc64) @@ -75,12 +75,6 @@ Check_multiarchitecture () DESTDIR_INSTALL="${DESTDIR_INSTALL}.386" ;; - lpia) - DESTDIR="${DESTDIR}.lpi" - DESTDIR_LIVE="${DESTDIR_LIVE}.lpi" - DESTDIR_INSTALL="${DESTDIR_INSTALL}.lpi" - ;; - powerpc) DESTDIR="${DESTDIR}.ppc" DESTDIR_LIVE="${DESTDIR_LIVE}.ppc" diff --git a/functions/defaults.sh b/functions/defaults.sh index 3179df068..c330b4281 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -509,19 +509,6 @@ Set_defaults () LH_LINUX_FLAVOURS="itanium" ;; - lpia) - case "${LH_MODE}" in - debian|debian-release|embedian) - Echo_error "Architecture ${LH_ARCHITECTURE} not supported on ${LH_MODE}." - exit 1 - ;; - - *) - LH_LINUX_FLAVOURS="lpia" - ;; - esac - ;; - powerpc) case "${LIST}" in stripped|minimal) @@ -703,7 +690,7 @@ Set_defaults () if [ -z "${LH_BOOTLOADER}" ] then case "${LH_ARCHITECTURE}" in - amd64|i386|lpia) + amd64|i386) LH_BOOTLOADER="syslinux" ;; @@ -891,7 +878,7 @@ Set_defaults () # Setting win32-loader option case "${LH_ARCHITECTURE}" in - amd64|i386|lpia) + amd64|i386) if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] then LH_WIN32_LOADER="${LH_WIN32_LOADER:-enabled}" |