mk-sbuild_raspbian.diff
· 942 B · Diff
Raw
--- /usr/bin/mk-sbuild 2013-10-14 22:02:00.000000000 +0200
+++ /tmp/mk-sbuild 2013-11-24 22:56:49.000000000 +0100
@@ -618,7 +618,11 @@
sudo mkdir -p -m 0700 "$MNT"/root/.gnupg
# debootstrap the chroot
-sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
+if [ "$CHROOT_ARCH" = "armhf" ]; then
+ sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" "${DEBOOTSTRAP_KEYRING}"
+else
+ sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
+fi
# Update the package sources
TEMP_SOURCES=`mktemp -t sources-XXXXXX`
| 1 | --- /usr/bin/mk-sbuild 2013-10-14 22:02:00.000000000 +0200 |
| 2 | +++ /tmp/mk-sbuild 2013-11-24 22:56:49.000000000 +0100 |
| 3 | @@ -618,7 +618,11 @@ |
| 4 | sudo mkdir -p -m 0700 "$MNT"/root/.gnupg |
| 5 | |
| 6 | # debootstrap the chroot |
| 7 | -sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" |
| 8 | +if [ "$CHROOT_ARCH" = "armhf" ]; then |
| 9 | + sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" "${DEBOOTSTRAP_KEYRING}" |
| 10 | +else |
| 11 | + sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" |
| 12 | +fi |
| 13 | |
| 14 | # Update the package sources |
| 15 | TEMP_SOURCES=`mktemp -t sources-XXXXXX` |
| 16 |