summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Calianu <adrian.calianu@enea.com>2018-05-15 15:08:45 +0200
committerAdrian Dudau <adrian.dudau@enea.com>2018-05-18 08:51:22 +0200
commited5783a862451d26e150ec493da21d868ea21e47 (patch)
treec3a591a5945e324d51be738334bd366a7d4f84ca
parent98d8b9dd39fbc2cd15518ceed2f3c1f3994a091d (diff)
downloadmeta-el-nfv-access-ed5783a862451d26e150ec493da21d868ea21e47.tar.gz
enea-nfv-access-vnf: generate disk image
image-vm/qcow2 bbclass was removed from poky and replaced with wic.qcow2. For this solution we need a customer wks file. Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
-rw-r--r--images/enea-nfv-access-vnf.bb8
-rw-r--r--scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks5
2 files changed, 7 insertions, 6 deletions
diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-nfv-access-vnf.bb
index cb43bc3..a3902c2 100644
--- a/images/enea-nfv-access-vnf.bb
+++ b/images/enea-nfv-access-vnf.bb
@@ -2,12 +2,8 @@ DESCRIPTION = "VNF image of the Enea NFV Access Platform, includes kernel, rootf
2 2
3require images/enea-nfv-access-common.inc 3require images/enea-nfv-access-common.inc
4 4
5# Enea VNF boot configuration 5IMAGE_FSTYPES += "wic.qcow2"
6ROOT_VM = "root=/dev/vda2" 6WKS_FILE = "enea-nfv-access-vnf-qemux86-64.wks"
7APPEND = "console=ttyS0,115200 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet"
8SYSLINUX_TIMEOUT = "30"
9
10IMAGE_FSTYPES += "ext4.qcow2"
11 7
12CLOUDINITPKGS = "cloud-init util-linux-blkid" 8CLOUDINITPKGS = "cloud-init util-linux-blkid"
13CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}" 9CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}"
diff --git a/scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks b/scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks
new file mode 100644
index 0000000..69cf902
--- /dev/null
+++ b/scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks
@@ -0,0 +1,5 @@
1# short-description: Create an MBR partition table with PCBIOS
2# long-description: Create an MBR partition table with PCBIOS
3part /boot --source bootimg-pcbios --label boot --active --align 1024
4part / --source rootfs --use-uuid --fstype=ext4 --label access --align 1024
5bootloader --ptable gpt --timeout=5 --append="console=ttyS0,115200 console=tty0 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet"