cleanup: remove all remnets of DI_BROKEN_USE_CROSS

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 13 years ago
parent 6807b1acff
commit 07e5a02fcb

@ -46,10 +46,6 @@ unset KERNEL_DEB
GIT_VERSION=$(git rev-parse --short HEAD) GIT_VERSION=$(git rev-parse --short HEAD)
IN_VALID_UBOOT=1 IN_VALID_UBOOT=1
#Should now be fixed, more b4 removal..
#DI_BROKEN_USE_CROSS=1
unset DI_BROKEN_USE_CROSS
DIST=squeeze DIST=squeeze
ARCH=armel ARCH=armel
DISTARCH="${DIST}-${ARCH}" DISTARCH="${DIST}-${ARCH}"
@ -227,11 +223,11 @@ function dl_kernel_image {
KERNEL_SEL="STABLE" KERNEL_SEL="STABLE"
if [ "$BETA_KERNEL" ];then if [ "${BETA_KERNEL}" ] ; then
KERNEL_SEL="TESTING" KERNEL_SEL="TESTING"
fi fi
if [ "$EXPERIMENTAL_KERNEL" ];then if [ "${EXPERIMENTAL_KERNEL}" ] ; then
KERNEL_SEL="EXPERIMENTAL" KERNEL_SEL="EXPERIMENTAL"
fi fi
@ -260,17 +256,12 @@ function dl_kernel_image {
ACTUAL_DEB_FILE="linux-image-${ACTUAL_DEB_FILE}.deb" ACTUAL_DEB_FILE="linux-image-${ACTUAL_DEB_FILE}.deb"
wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${MIRROR}/${DISTARCH}/v${KERNEL}/${ACTUAL_DEB_FILE} wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${MIRROR}/${DISTARCH}/v${KERNEL}/${ACTUAL_DEB_FILE}
if [ "${DI_BROKEN_USE_CROSS}" ] ; then
CROSS_DEB_FILE=$(echo ${ACTUAL_DEB_FILE} | sed 's:'${DIST}':cross:g')
wget -c --directory-prefix="${DIR}/dl/${DISTARCH}" ${MIRROR}/cross/v${KERNEL}/${CROSS_DEB_FILE}
fi
else else
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)
cp -v ${DEB_FILE} "${DIR}/dl/${DISTARCH}/" cp -v ${DEB_FILE} "${DIR}/dl/${DISTARCH}/"
fi fi
echo "Using: ${ACTUAL_DEB_FILE}" echo "Using: ${ACTUAL_DEB_FILE}"
} }
@ -853,11 +844,7 @@ function extract_base_initrd {
echo "NetInstall: Extracting Base ${NETINSTALL}" echo "NetInstall: Extracting Base ${NETINSTALL}"
cd ${TEMPDIR}/initrd-tree cd ${TEMPDIR}/initrd-tree
zcat "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | cpio -i -d zcat "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | cpio -i -d
if [ ! "${DI_BROKEN_USE_CROSS}" ] ; then
dpkg -x "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/initrd-tree dpkg -x "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/initrd-tree
else
dpkg -x "${DIR}/dl/${DISTARCH}/${CROSS_DEB_FILE}" ${TEMPDIR}/initrd-tree
fi
cd "${DIR}/" cd "${DIR}/"
} }
@ -1066,11 +1053,7 @@ function recompress_initrd {
function extract_zimage { function extract_zimage {
echo "NetInstall: Extracting Kernel Boot Image" echo "NetInstall: Extracting Kernel Boot Image"
if [ ! "${DI_BROKEN_USE_CROSS}" ] ; then
dpkg -x "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/kernel dpkg -x "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/kernel
else
dpkg -x "${DIR}/dl/${DISTARCH}/${CROSS_DEB_FILE}" ${TEMPDIR}/kernel
fi
} }
function create_custom_netinstall_image { function create_custom_netinstall_image {

Loading…
Cancel
Save