builder: Use newly open sourced edk2 from Fedora, replacing kraxel's builds.

This commit is contained in:
Richard W.M. Jones
2016-06-22 12:45:18 +01:00
parent 27b3b2cf7d
commit e4e197bb86
2 changed files with 4 additions and 4 deletions

View File

@@ -82,14 +82,14 @@ trap cleanup INT QUIT TERM EXIT ERR
# https://bugzilla.redhat.com/show_bug.cgi?id=1189143
# work around it:
vars=$(mktemp)
cp /usr/share/edk2.git/aarch64/vars-template-pflash.raw $vars
cp /usr/share/edk2/aarch64/vars-template-pflash.raw $vars
virt-install \
--name=$tmpname \
--ram=4096 \
--cpu=host --vcpus=2 \
--os-type=linux --os-variant=fedora21 \
--boot loader=/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw,loader_ro=yes,loader_type=pflash,nvram=$vars \
--boot loader=/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw,loader_ro=yes,loader_type=pflash,nvram=$vars \
--initrd-inject=$ks \
--extra-args="ks=file:/`basename $ks` earlyprintk=pl011,0x9000000 ignore_loglevel console=ttyAMA0 no_timer_check printk.time=1 proxy=$http_proxy" \
--disk $(pwd)/$output,size=6,format=raw \

View File

@@ -134,14 +134,14 @@ trap cleanup INT QUIT TERM EXIT ERR
# https://bugzilla.redhat.com/show_bug.cgi?id=1189143
# work around it:
vars=$(mktemp)
cp /usr/share/edk2.git/aarch64/vars-template-pflash.raw $vars
cp /usr/share/edk2/aarch64/vars-template-pflash.raw $vars
virt-install \
--name=$tmpname \
--ram=2048 \
--cpu=cortex-a57 --vcpus=1 \
--os-type=linux --os-variant=rhel$major \
--boot loader=/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw,loader_ro=yes,loader_type=pflash,nvram=$vars \
--boot loader=/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw,loader_ro=yes,loader_type=pflash,nvram=$vars \
--initrd-inject=$ks \
--extra-args="ks=file:/`basename $ks` earlyprintk=pl011,0x9000000 ignore_loglevel console=ttyAMA0 no_timer_check printk.time=1" \
--disk $(pwd)/$output,size=6,format=raw \