distro: squeeze: bypass keyboard setup with preseed to work around lock up with native built debs, non us keymaps see scripts/squeeze-preseed.cfg

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 13 years ago
parent aad08e2fac
commit 05a3122d8d

@ -38,7 +38,10 @@ unset USE_UENV
SCRIPT_VERSION="2.00" SCRIPT_VERSION="2.00"
IN_VALID_UBOOT=1 IN_VALID_UBOOT=1
DI_BROKEN_USE_CROSS=1
#Should now be fixed, more b4 removal..
#DI_BROKEN_USE_CROSS=1
unset DI_BROKEN_USE_CROSS
MIRROR="http://rcn-ee.net/deb/" MIRROR="http://rcn-ee.net/deb/"
DIST=squeeze DIST=squeeze
@ -203,7 +206,6 @@ function dl_kernel_image {
wget -c --directory-prefix=${DIR}/dl/${DISTARCH} ${MIRROR}cross/v${KERNEL}/${CROSS_DEB_FILE} wget -c --directory-prefix=${DIR}/dl/${DISTARCH} ${MIRROR}cross/v${KERNEL}/${CROSS_DEB_FILE}
fi fi
else else
unset DI_BROKEN_USE_CROSS
KERNEL=${DEB_FILE} KERNEL=${DEB_FILE}
#Remove all "\" from file name. #Remove all "\" from file name.
ACTUAL_DEB_FILE=$(echo ${DEB_FILE} | sed 's!.*/!!' | grep linux-image) ACTUAL_DEB_FILE=$(echo ${DEB_FILE} | sed 's!.*/!!' | grep linux-image)
@ -1520,7 +1522,6 @@ case "$UBOOT_TYPE" in
BOOTLOADER="MX53LOCO" BOOTLOADER="MX53LOCO"
SERIAL="ttymxc0" SERIAL="ttymxc0"
is_imx53 is_imx53
unset DI_BROKEN_USE_CROSS
;; ;;
esac esac
@ -1569,7 +1570,6 @@ function check_distro {
DIST=oneiric DIST=oneiric
ARCH=armel ARCH=armel
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
unset DI_BROKEN_USE_CROSS
unset IN_VALID_DISTRO unset IN_VALID_DISTRO
fi fi
@ -1578,7 +1578,6 @@ function check_distro {
DIST=maverick DIST=maverick
ARCH=armel ARCH=armel
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
unset DI_BROKEN_USE_CROSS
unset IN_VALID_DISTRO unset IN_VALID_DISTRO
fi fi
@ -1587,7 +1586,6 @@ function check_distro {
DIST=natty DIST=natty
ARCH=armel ARCH=armel
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
unset DI_BROKEN_USE_CROSS
unset IN_VALID_DISTRO unset IN_VALID_DISTRO
fi fi
@ -1596,7 +1594,6 @@ function check_distro {
DIST=precise DIST=precise
ARCH=armel ARCH=armel
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
unset DI_BROKEN_USE_CROSS
unset IN_VALID_DISTRO unset IN_VALID_DISTRO
fi fi
@ -1605,7 +1602,6 @@ function check_distro {
DIST=precise DIST=precise
ARCH=armhf ARCH=armhf
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
unset DI_BROKEN_USE_CROSS
unset IN_VALID_DISTRO unset IN_VALID_DISTRO
fi fi

@ -3,6 +3,12 @@
d-i apt-setup/non-free boolean true d-i apt-setup/non-free boolean true
d-i apt-setup/contrib boolean true d-i apt-setup/contrib boolean true
# Squeeze only: (doesn't seem to effect maverick/natty/oneiric/precise..)
# (working around a gcc/bug, where netinstall locks up here, cross compiled *.deb would work fine...)
d-i console-tools/archs string skip-config
d-i debian-installer/locale string en_US
d-i console-keymaps-at/keymap select us
# Individual additional packages to install # Individual additional packages to install
d-i pkgsel/include string uboot-mkimage pastebinit initramfs-tools wget firmware-linux ntpdate bash d-i pkgsel/include string uboot-mkimage pastebinit initramfs-tools wget firmware-linux ntpdate bash

Loading…
Cancel
Save