mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-12 15:41:09 +00:00
* mk-sbuild-lv: support foreign armel schroots
* debian/control: add qemu-arm-static to Recommends:
This commit is contained in:
parent
dc678ec284
commit
c8f27f6cfe
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -1,11 +1,12 @@
|
||||
ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
|
||||
ubuntu-dev-tools (0.92) UNRELEASED; urgency=low
|
||||
|
||||
[ Siegfried-Angel Gevatter Pujals ]
|
||||
* bash_completion/pbuilder-dist:
|
||||
- Enable tab-completion for pbuilder-lucid and cowbuilder-lucid.
|
||||
|
||||
-- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Wed, 03 Feb 2010 12:35:56 +0100
|
||||
|
||||
ubuntu-dev-tools (0.92) UNRELEASED; urgency=low
|
||||
[ Emmet Hikory ]
|
||||
* mk-sbuild-lv: support foreign armel schroots
|
||||
* debian/control: add qemu-arm-static to Recommends:
|
||||
|
||||
[ Michael Bienia ]
|
||||
* ubuntutools/requestsync/mail.py:
|
||||
@ -17,7 +18,7 @@ ubuntu-dev-tools (0.92) UNRELEASED; urgency=low
|
||||
* mk-sbuild-lv: adjust schroot.conf template to document the -source
|
||||
change further.
|
||||
|
||||
-- Kees Cook <kees@ubuntu.com> Mon, 18 Jan 2010 16:08:16 -0800
|
||||
-- Emmet Hikory <persia@ubuntu.com> Wed, 03 Feb 2010 11:39:12 -0800
|
||||
|
||||
ubuntu-dev-tools (0.91) lucid; urgency=low
|
||||
|
||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -17,7 +17,7 @@ Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo,
|
||||
dpkg-dev, python-apt (>= 0.7.9), python-lazr.restfulclient
|
||||
Recommends: bzr, pbuilder | cowdancer | sbuild, reportbug (>= 3.39ubuntu1),
|
||||
ca-certificates, debootstrap, genisoimage, perl-modules, libwww-perl,
|
||||
libapt-pkg-perl
|
||||
libapt-pkg-perl, qemu-arm-static
|
||||
Conflicts: devscripts (<< 2.10.7ubuntu5)
|
||||
Replaces: devscripts (<< 2.10.7ubuntu5)
|
||||
Description: useful tools for Ubuntu developers
|
||||
|
17
mk-sbuild-lv
17
mk-sbuild-lv
@ -204,8 +204,9 @@ CHROOT_LV="${name}_chroot${arch_suffix}"
|
||||
CHROOT_PATH="/dev/$VG/$CHROOT_LV"
|
||||
CHROOT_NAME="${name}${arch_suffix}"
|
||||
|
||||
HOST_ARCH=$(dpkg --print-architecture)
|
||||
if [ -z "$CHROOT_ARCH" ]; then
|
||||
CHROOT_ARCH=$(dpkg --print-architecture)
|
||||
CHROOT_ARCH=$HOST_ARCH
|
||||
fi
|
||||
|
||||
# Load customizations
|
||||
@ -311,7 +312,19 @@ sudo mkfs -t ext4 "$CHROOT_PATH"
|
||||
# Mount and debootstrap the chroot
|
||||
MNT=`mktemp -d -t schroot-XXXXXX`
|
||||
sudo mount "$CHROOT_PATH" "$MNT"
|
||||
sudo debootstrap $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
|
||||
|
||||
DEBOOTSTRAP_COMMAND=debootstrap
|
||||
# Use qemu-arm-static / build-arm-chroot for foreign armel chroots
|
||||
if [ "$CHROOT_ARCH" = 'armel' ] && [ ! "$HOST_ARCH" = 'armel' ] ; then
|
||||
if [ -f "/usr/bin/build-arm-chroot" ]; then
|
||||
DEBOOTSTRAP_COMMAND=build-arm-chroot
|
||||
else
|
||||
echo Please install qemu-arm-static to use foreign armel chroots
|
||||
fi
|
||||
fi
|
||||
|
||||
sudo $DEBOOTSTRAP_COMMAND $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
|
||||
|
||||
# Update the package sources
|
||||
TEMP_SOURCES=`mktemp -t sources-XXXXXX`
|
||||
if [ -z "$TEMPLATE_SOURCES" ]; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user