[SCM] live-helper branch, debian, updated. debian/2.0_a2-1-4-g31360f1
Daniel Baumann
daniel at debian.org
Wed Dec 9 20:57:08 UTC 2009
The following commit has been merged in the debian branch:
commit 31360f1031a15b0f2d302909bc16920545b34b6e
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Dec 9 21:54:41 2009 +0100
Removing lpia support, this architecture is dead.
diff --git a/functions/architecture.sh b/functions/architecture.sh
index 278ec6a..cd8e073 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 3179df0..c330b42 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}"
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 046e1b4..9fccdfa 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -290,7 +290,7 @@ else
if [ "${LH_DEBIAN_INSTALLER_GUI}" = "enabled" ]
then
case "${LH_ARCHITECTURE}" in
- amd64|i386|lpia)
+ amd64|i386)
DOWNLOAD_GTK_INSTALLER=1
;;
@@ -326,7 +326,7 @@ then
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
;;
- i386|lpia)
+ i386)
DI_REQ_PACKAGES="elilo lilo grub"
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
;;
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index a30aa3d..b2ccfea 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -46,7 +46,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Check architecture
-Check_architecture amd64 i386 lpia
+Check_architecture amd64 i386
Check_crossarchitecture
# Checking depends
diff --git a/helpers/lh_binary_grub2 b/helpers/lh_binary_grub2
index a04ad8f..41d9483 100755
--- a/helpers/lh_binary_grub2
+++ b/helpers/lh_binary_grub2
@@ -46,7 +46,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Check architecture
-Check_architecture amd64 i386 lpia
+Check_architecture amd64 i386
Check_crossarchitecture
# Checking depends
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 7c8ed66..e7f6e60 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -70,10 +70,6 @@ case "${LH_ARCHITECTURE}" in
ARCH="386"
;;
- lpia)
- ARCH="lpi"
- ;;
-
powerpc)
ARCH="ppc"
;;
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index cfe455c..98a3be5 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -42,7 +42,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ] && [ "${LH_ARCHITECTURE}" != "lpia" ]
+if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ]
then
Echo_warning "skipping binary_memtest, foreign architecture."
exit 0
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 749a6f4..39c7d62 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -38,7 +38,7 @@ Check_lockfile .lock
Create_lockfile .lock
case "${LH_ARCHITECTURE}" in
- amd64|i386|lpia)
+ amd64|i386)
LINUX="vmlinuz"
;;
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index a6ad7e3..70ff5d8 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -46,7 +46,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Check architecture
-Check_architecture amd64 i386 lpia
+Check_architecture amd64 i386
Check_crossarchitecture
# Checking depends
@@ -259,7 +259,7 @@ Copy_syslinux_templates ()
fi
case "${LH_ARCHITECTURE}" in
- amd64|i386|powerpc|lpia)
+ amd64|i386|powerpc)
if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
then
for FILE in ${SCREEN_PATH}/*.install.g-i
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index 7eb7eea..6a61dfa 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -43,7 +43,7 @@ Check_lockfile .lock
Create_lockfile .lock
case "${LH_ARCHITECTURE}" in
- amd64|i386|lpia)
+ amd64|i386)
if [ "${LH_CHROOT_BUILD}" = "enabled" ]
then
# Checking depends
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 84e2567..34b31d9 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -117,7 +117,7 @@ then
# bootloader is already installed in the image. Very ugly, but it's to
# late to fix it in d-i because lenny rc2 has been already released.
case "${LH_ARCHITECTURE}" in
- amd64|i386|lpia)
+ amd64|i386)
case "${LH_BOOTLOADER}" in
grub)
Apt install grub
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index b3cd08b..ef0449d 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -64,7 +64,7 @@ mtd-tools
EOF
case "${LH_ARCHITECTURE}" in
- amd64|i386|lpia)
+ amd64|i386)
cat >> source-selection.txt << EOF
mtools
--
live-helper
More information about the debian-live-changes
mailing list