diff --git a/mk-sbuild-lv b/mk-sbuild-lv index 3aec1d8..425d694 100755 --- a/mk-sbuild-lv +++ b/mk-sbuild-lv @@ -215,6 +215,7 @@ else variant_opt="--variant=buildd" fi +BUILD_PKGS="build-essential fakeroot devscripts apt-utils" # Handle distro-specific logic, unknown to debootstrap case "$DISTRO" in ubuntu) @@ -234,6 +235,13 @@ ubuntu) if [ -z "$SOURCES_SECURITY_URL" ]; then SOURCES_SECURITY_URL="http://security.ubuntu.com/ubuntu" fi + # Add edgy+ buildd tools + if [ "$RELEASE" != "breezy" ] && [ "$RELEASE" != "dapper" ]; then + # Disable recommends for a smaller chroot (gutsy and later only) + BUILD_PKGS="--no-install-recommends $BUILD_PKGS" + # Add buildd tools + BUILD_PKGS="$BUILD_PKGS pkg-create-dbgsym pkgbinarymangler" + fi ;; debian) if [ -z "$DEBOOTSTRAP_MIRROR" ]; then @@ -330,13 +338,6 @@ cat "$TEMP_SCHROOTCONF" | sed \ sudo bash -c "cat >> /etc/schroot/schroot.conf" rm -f "$TEMP_SCHROOTCONF" # Create image finalization script -BUILD_PKGS="build-essential fakeroot devscripts apt-utils" -# Add edgy+ buildd tools -if [ "$RELEASE" != "breezy" ] && [ "$RELEASE" != "dapper" ]; then - # Disable recommends for a smaller chroot (gutsy and later only) - # Add buildd tools - BUILD_PKGS="--no-install-recommends $BUILD_PKGS pkg-create-dbgsym pkgbinarymangler" -fi sudo bash -c "cat >> $MNT/finish.sh" <