jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3245 from CvH/9.0/ova-size

Browse Source 
ova template adjustments
This commit is contained in:
MilhouseVH 2019-01-25 11:27:52 +00:00 committed by GitHub
commit e370750526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
projects/Generic/config/ovf.template
View File

@ -2,11 +2,11 @@
xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf"
xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<References>
<File ovf:href="@DISK@.vmdk" ovf:id="file" ovf:size="@DISK_SIZE@"/>
<File ovf:href="@DISK@.vmdk" ovf:id="file" ovf:size="@OVA_SIZE@"/>
</References>
<DiskSection>
<Info>Virtual disk information</Info>
<Disk ovf:capacity="@DISK_SIZE@" ovf:diskId="disk" ovf:fileRef="file" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"/>
<Disk ovf:capacity="@OVA_SIZE@" ovf:diskId="disk" ovf:fileRef="file" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"/>
</DiskSection>
<NetworkSection>
<Info>The list of logical networks</Info>
@ -21,8 +21,8 @@ xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemS
<Info>Meta-information about the installed software</Info>
<Product>LibreELEC</Product>
<Vendor>LibreELEC</Vendor>
<ProductUrl>http://libreelec.tv</ProductUrl>
<VendorUrl>http://libreelec.tv</VendorUrl>
<ProductUrl>https://libreelec.tv</ProductUrl>
<VendorUrl>https://libreelec.tv</VendorUrl>
</ProductSection>
<AnnotationSection>
<Info>A human-readable annotation</Info>
@ -49,10 +49,10 @@ xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemS
<Item>
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
<rasd:Description>Memory Size</rasd:Description>
<rasd:ElementName>512MB of memory</rasd:ElementName>
<rasd:ElementName>1024MB of memory</rasd:ElementName>
<rasd:InstanceID>2</rasd:InstanceID>
<rasd:ResourceType>4</rasd:ResourceType>
<rasd:VirtualQuantity>512</rasd:VirtualQuantity>
<rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
</Item>
<Item ovf:required="false">
<rasd:Address>0</rasd:Address>

3
projects/Generic/options
View File

@ -98,3 +98,6 @@
# for a list of additional drivers see packages/linux-driver-addons
# Space separated list is supported,
DRIVER_ADDONS="crazycat digital_devices dvb-latest"
# Default size of the ova image, in MB, eg. 4096
OVA_SIZE="4096"

2
scripts/mkimage
View File

@ -307,7 +307,7 @@ if [ "${PROJECT}" = "Generic" ]; then
qemu-img convert -O vmdk -o subformat=streamOptimized "${DISK_BASENAME}.tmp" "${DISK_BASENAME}.vmdk"
# generate ovf from template
sed -e "s,@DISTRO@,${DISTRO},g" -e "s,@DISK@,${IMAGE_NAME},g" \
-e "s,@DISK_SIZE@,$((${DISK_SIZE}*1024*1024)),g" \
-e "s,@OVA_SIZE@,$(($OVA_SIZE*1024*1024)),g" \
"${PROJECT_DIR}/${PROJECT}/config/ovf.template" > "${DISK_BASENAME}.ovf"
# combine ovf and vmdk into official ova
tar -C "${TARGET_IMG}" -cf "${DISK_BASENAME}.ova" "${IMAGE_NAME}.ovf" "${IMAGE_NAME}.vmdk"