Commit f42d81fa authored by Colin Watson's avatar Colin Watson

Don't use --arch when we specifically care about the host architecture (closes: #637298).

parent d7cccc36
......@@ -3,6 +3,8 @@ debootstrap (1.0.35) UNRELEASED; urgency=low
[ Robert Millan ]
* Don't build devices.tar.gz if building on GNU/kFreeBSD (closes:
#637297).
* Don't use --arch when we specifically care about the host architecture
(closes: #637298).
-- Colin Watson <cjwatson@debian.org> Wed, 10 Aug 2011 12:59:44 +0100
......
......@@ -28,6 +28,7 @@ KEYRING=""
DISABLE_KEYRING=""
VARIANT=""
ARCH=""
HOST_ARCH=""
KEEP_DEBOOTSTRAP_DIR=""
USE_DEBIANINSTALLER_INTERACTION=""
SECOND_STAGE_ONLY=""
......@@ -389,20 +390,24 @@ fi
###########################################################################
if [ "$ARCH" != "" ]; then
true
elif [ -x /usr/bin/dpkg ] && \
if [ -x /usr/bin/dpkg ] && \
/usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
ARCH=`/usr/bin/dpkg --print-architecture`
HOST_ARCH=`/usr/bin/dpkg --print-architecture`
elif type udpkg >/dev/null 2>&1 && \
udpkg --print-architecture >/dev/null 2>&1; then
ARCH=`/usr/bin/udpkg --print-architecture`
HOST_ARCH=`/usr/bin/udpkg --print-architecture`
elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
ARCH=`cat $DEBOOTSTRAP_DIR/arch`
HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
else
error 1 WHATARCH "Couldn't work out current architecture"
fi
if [ "$ARCH" != "" ]; then
true
else
ARCH=$HOST_ARCH
fi
if [ "$TARGET" = "/" ]; then
CHROOT_CMD=""
elif doing_variant scratchbox; then
......
......@@ -938,7 +938,7 @@ clear_mtab () {
}
setup_proc () {
case "$ARCH" in
case "$HOST_ARCH" in
kfreebsd-*)
umount_on_exit /dev
umount_on_exit /proc
......@@ -977,7 +977,7 @@ setup_devices () {
return 0
fi
case "$ARCH" in
case "$HOST_ARCH" in
kfreebsd-*)
in_target mount -t devfs devfs /dev ;;
hurd-*)
......@@ -1198,7 +1198,7 @@ get_next_predep () {
check_sane_mount () {
mkdir -p "$1"
case "$ARCH" in
case "$HOST_ARCH" in
kfreebsd-*|hurd-*)
;;
*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment