diff options
Diffstat (limited to 'recipes-extended/images/xen-image-minimal.bb')
| -rw-r--r-- | recipes-extended/images/xen-image-minimal.bb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index ca6d2683..2a44e3c4 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb | |||
| @@ -21,13 +21,13 @@ IMAGE_INSTALL += " \ | |||
| 21 | do_build[depends] += "xen:do_deploy" | 21 | do_build[depends] += "xen:do_deploy" |
| 22 | 22 | ||
| 23 | # Networking for HVM-mode guests (x86/64 only) requires the tun kernel module | 23 | # Networking for HVM-mode guests (x86/64 only) requires the tun kernel module |
| 24 | IMAGE_INSTALL_append_x86 = "kernel-module-tun" | 24 | IMAGE_INSTALL:append:x86 = "kernel-module-tun" |
| 25 | IMAGE_INSTALL_append_x86-64 = "kernel-module-tun" | 25 | IMAGE_INSTALL:append:x86-64 = "kernel-module-tun" |
| 26 | 26 | ||
| 27 | # Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86 | 27 | # Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86 |
| 28 | XEN_PCIBACK_MODULE = "" | 28 | XEN_PCIBACK_MODULE = "" |
| 29 | XEN_PCIBACK_MODULE_x86 = "kernel-module-xen-pciback" | 29 | XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback" |
| 30 | XEN_PCIBACK_MODULE_x86-64 = "kernel-module-xen-pciback" | 30 | XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback" |
| 31 | 31 | ||
| 32 | LICENSE = "MIT" | 32 | LICENSE = "MIT" |
| 33 | 33 | ||
| @@ -41,21 +41,21 @@ do_check_xen_state() { | |||
| 41 | 41 | ||
| 42 | addtask check_xen_state before do_rootfs | 42 | addtask check_xen_state before do_rootfs |
| 43 | 43 | ||
| 44 | syslinux_iso_populate_append() { | 44 | syslinux_iso_populate:append() { |
| 45 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR} | 45 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR} |
| 46 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR} | 46 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR} |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | syslinux_hddimg_populate_append() { | 49 | syslinux_hddimg_populate:append() { |
| 50 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR} | 50 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR} |
| 51 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR} | 51 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR} |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | grubefi_populate_append() { | 54 | grubefi_populate:append() { |
| 55 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz | 55 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | syslinux_populate_append() { | 58 | syslinux_populate:append() { |
| 59 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz | 59 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz |
| 60 | } | 60 | } |
| 61 | 61 | ||
| @@ -74,6 +74,7 @@ build_syslinux_cfg () { | |||
| 74 | 74 | ||
| 75 | # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp | 75 | # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp |
| 76 | WKS_FILE_x86-64 = "directdisk-xen.wks" | 76 | WKS_FILE_x86-64 = "directdisk-xen.wks" |
| 77 | QB_MEM ?= "-m 400" | ||
| 77 | QB_DEFAULT_KERNEL ?= "none" | 78 | QB_DEFAULT_KERNEL ?= "none" |
| 78 | QB_DEFAULT_FSTYPE ?= "wic" | 79 | QB_DEFAULT_FSTYPE ?= "wic" |
| 79 | QB_DEFAULT_FSTYPE_qemux86-64 = "wic" | 80 | QB_DEFAULT_FSTYPE_qemux86-64 = "wic" |
| @@ -81,7 +82,7 @@ QB_FSINFO ?= "wic:kernel-in-fs" | |||
| 81 | QB_SERIAL_OPT = "-serial mon:stdio" | 82 | QB_SERIAL_OPT = "-serial mon:stdio" |
| 82 | # qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed | 83 | # qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed |
| 83 | # to boot this image, so add it here: | 84 | # to boot this image, so add it here: |
| 84 | IMAGE_FSTYPES_qemux86-64 += "wic" | 85 | IMAGE_FSTYPES:qemux86-64 += "wic" |
| 85 | # Networking: the qemuboot.bbclass default virtio network device works ok | 86 | # Networking: the qemuboot.bbclass default virtio network device works ok |
| 86 | # and so does the emulated e1000 -- choose according to the network device | 87 | # and so does the emulated e1000 -- choose according to the network device |
| 87 | # drivers that are present in your dom0 Linux kernel. To switch to e1000: | 88 | # drivers that are present in your dom0 Linux kernel. To switch to e1000: |
