Source ubuntu-cpc functions from the right place

ubuntu/zesty
Balint Reczey 8 years ago
parent 24a6552b56
commit 7cae48fd12

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

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

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

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

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

@ -18,7 +18,7 @@ case ${IMAGE_TARGETS:-} in
;; ;;
esac esac
. /build/config/functions . config/functions
if [ -e binary/boot/disk-uefi.ext4 ]; then if [ -e binary/boot/disk-uefi.ext4 ]; then
create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk

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

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

Loading…
Cancel
Save