From ed5783a862451d26e150ec493da21d868ea21e47 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 15 May 2018 15:08:45 +0200 Subject: 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 Signed-off-by: Adrian Dudau --- images/enea-nfv-access-vnf.bb | 8 ++------ scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks | 5 +++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks 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 require images/enea-nfv-access-common.inc -# Enea VNF boot configuration -ROOT_VM = "root=/dev/vda2" -APPEND = "console=ttyS0,115200 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet" -SYSLINUX_TIMEOUT = "30" - -IMAGE_FSTYPES += "ext4.qcow2" +IMAGE_FSTYPES += "wic.qcow2" +WKS_FILE = "enea-nfv-access-vnf-qemux86-64.wks" CLOUDINITPKGS = "cloud-init util-linux-blkid" CLOUDINITPKGS += " ${@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 @@ +# short-description: Create an MBR partition table with PCBIOS +# long-description: Create an MBR partition table with PCBIOS +part /boot --source bootimg-pcbios --label boot --active --align 1024 +part / --source rootfs --use-uuid --fstype=ext4 --label access --align 1024 +bootloader --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" -- cgit v1.2.3-54-g00ecf