Depend on packages in main instead of installing them at runtime

ubuntu/artful
Balint Reczey 8 years ago
parent 1ce405bb8c
commit aa54a130c3

9
debian/control vendored

@ -12,21 +12,28 @@ Depends: ${misc:Depends},
android-tools-fsutils [armhf],
apt-utils,
debootstrap,
dosfstools,
e2fsprogs,
gdisk,
genisoimage,
germinate (>= 1.25.1),
gnupg,
grep-dctrl,
kpartx,
live-build (>= 3.0~a57-1ubuntu12~),
lsb-release,
lzma,
parted,
procps,
python-minimal | python,
python3-software-properties,
qemu-utils,
rsync,
snapd,
squashfs-tools (>= 1:3.3-1),
sudo,
ubuntu-image
ubuntu-image,
zerofree
Suggests: partimage
Breaks: ubuntu-defaults-builder (<< 0.32)
Description: construction script for the livecd rootfs

@ -8,8 +8,6 @@ loop_device=
loop_raw=
backing_img=
apt-get -qqy install dosfstools gdisk
clean_loops() {
local kpartx_ret
local kpartx_stdout
@ -51,7 +49,6 @@ make_ext4_partition() {
}
mount_image() {
apt-get install -qqy kpartx
trap clean_loops EXIT
backing_img="$1"
local rootpart="$2"
@ -158,7 +155,6 @@ umount_partition() {
# both of these are likely overkill, but it does result in slightly
# smaller ext4 filesystem
apt-get -qqy install zerofree
e2fsck -y -E discard ${rootfs_dev_mapper}
zerofree ${rootfs_dev_mapper}
fi
@ -230,7 +226,7 @@ create_vmdk() {
destination="$2"
size="${3:-10240}"
apt-get install -qqy qemu-utils vmdk-stream-converter
apt-get install -qqy vmdk-stream-converter
streamconverter="/usr/share/pyshared/VMDKstream.py"
scratch_d=$(mktemp -d)
cp ${src} ${scratch_d}/resize.img
@ -263,8 +259,6 @@ create_derivative() {
}
convert_to_qcow2() {
apt-get install -qqy qemu-utils
src="$1"
destination="$2"
qemu-img convert -c -O qcow2 -o compat=0.10 "$src" "$destination"

@ -32,8 +32,6 @@ case $ARCH:$SUBARCH in
esac
create_empty_partition_table() {
apt-get install -qqy parted
parted "$1" --script -- mklabel msdos
}

@ -43,8 +43,6 @@ umount "binary/boot/squashfs.dir/dev/pts"
umount "binary/boot/squashfs.dir/dev"
umount "binary/boot/squashfs.dir/tmp"
apt-get -qqy install squashfs-tools
squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"
squashfs_f_manifest="${squashfs_f}.manifest"

@ -14,8 +14,6 @@ FS_LABEL="cloudimg-rootfs"
. config/functions
apt-get -qqy install dosfstools gdisk
create_partitions() {
disk_image="$1"
sgdisk "${disk_image}" --zap-all

@ -14,7 +14,6 @@ FS_LABEL="cloudimg-rootfs"
create_partitions() {
disk_image="$1"
apt-get install -qqy gdisk
sgdisk "${disk_image}" \
--zap-all
sgdisk "${disk_image}" \

@ -19,8 +19,6 @@ case $ARCH:$SUBARCH in
;;
esac
apt-get install -qqy qemu-utils
. config/functions
if [ -f binary/boot/disk-uefi.ext4 ]; then

@ -46,9 +46,6 @@ esac
. config/functions
# Virtualbox is needed for making a small VMDK
apt-get -qqy install genisoimage qemu-utils
# Lets be safe about this
box_d=$(mktemp -d)
seed_d=$(mktemp -d)

@ -25,8 +25,6 @@ fi
mkdir binary/boot/squashfs.dir
cp -a chroot/* binary/boot/squashfs.dir
apt-get -qqy install squashfs-tools
squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
squashfs_f_manifest="${squashfs_f}.manifest"

@ -159,8 +159,6 @@ umount "binary/boot/squashfs.dir/dev/pts"
umount "binary/boot/squashfs.dir/dev"
umount "binary/boot/squashfs.dir/tmp"
apt-get -qqy install squashfs-tools
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
(cd "$OVERLAY_ROOT/" &&

Loading…
Cancel
Save