Source ubuntu-cpc functions from the right place

ubuntu/yakkety
Balint Reczey 8 years ago
parent cc04805c04
commit 6fe8773c74

@ -1,6 +1,6 @@
#!/bin/bash -ex
. /build/config/functions
. config/functions
BOOTPART_START=
BOOTPART_END=

@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then
exit 0
fi
. /build/config/functions
. config/functions
mkdir binary/boot/squashfs.dir
cp -a chroot/* binary/boot/squashfs.dir

@ -9,7 +9,7 @@ case $ARCH in
;;
esac
. /build/config/functions
. config/functions
apt-get -qqy install dosfstools gdisk

@ -7,7 +7,7 @@ case $ARCH in
;;
esac
. /build/config/functions
. config/functions
create_partitions() {
disk_image="$1"

@ -12,7 +12,7 @@ esac
apt-get install -qqy qemu-utils
. /build/config/functions
. config/functions
if [ -f binary/boot/disk-uefi.ext4 ]; then
convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img

@ -9,7 +9,7 @@ case $ARCH in
exit 0;;
esac
. /build/config/functions
. config/functions
if [ -e binary/boot/disk-uefi.ext4 ]; then
create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk

@ -35,7 +35,7 @@ case $ARCH in
exit 0;;
esac
. /build/config/functions
. config/functions
# Virtualbox is needed for making a small VMDK
apt-get -qqy install genisoimage qemu-utils

@ -9,7 +9,7 @@ if [ ! -d ${my_dir}/extra ]; then
fi
# Export the common functions to the extras
. /build/config/functions
. config/functions
# Cleaner execution
/bin/run-parts --regex ".*\.binary" "${extra_d}"

Loading…
Cancel
Save