diff options
author | Christopher Clark <christopher.clark6@baesystems.com> | 2017-08-23 14:43:35 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-08-24 09:55:41 -0400 |
commit | 46149a8e0f625f0b2d421812fb4fdeefd8309477 (patch) | |
tree | de449c83af6abeff0117de4607ec15892e0a69e1 | |
parent | 52781c64b6e94e800bd6ff9310e389c91b077a51 (diff) | |
download | meta-virtualization-46149a8e0f625f0b2d421812fb4fdeefd8309477.tar.gz |
xen-image-minimal : change SYSLINUXCFG to SYSLINUX_CFG
The SYSLINUXCFG variable was renamed to SYSLINUX_CFG in poky and
openembedded-core with the commits referenced below.
This commit makes a corresponding change to fix the build for
xen-image-minimal.
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
git://git.openembedded.org/openembedded-core
commit e38c94d6bf83ed3ca7f046d9503e81b927487bf2
git://git.yoctoproject.org/poky.git
commit bb1c719250cecc8725147cbdd999a9a44a11b549
Author: Robert Yang <liezhi.yang@windriver.com>
Date: Wed Feb 24 01:23:58 2016 -0800
syslinux.bbclass: make vm and live can be built together
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-extended/images/xen-image-minimal.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index b8c20022..94240f69 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb | |||
@@ -50,12 +50,12 @@ SYSLINUX_XEN_ARGS ?= "loglvl=all guest_loglvl=all console=com1,vga com1=115200,8 | |||
50 | SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5" | 50 | SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5" |
51 | 51 | ||
52 | build_syslinux_cfg () { | 52 | build_syslinux_cfg () { |
53 | echo "ALLOWOPTIONS 1" > ${SYSLINUXCFG} | 53 | echo "ALLOWOPTIONS 1" > ${SYSLINUX_CFG} |
54 | echo "DEFAULT boot" >> ${SYSLINUXCFG} | 54 | echo "DEFAULT boot" >> ${SYSLINUX_CFG} |
55 | echo "TIMEOUT 10" >> ${SYSLINUXCFG} | 55 | echo "TIMEOUT 10" >> ${SYSLINUX_CFG} |
56 | echo "PROMPT 1" >> ${SYSLINUXCFG} | 56 | echo "PROMPT 1" >> ${SYSLINUX_CFG} |
57 | echo "LABEL boot" >> ${SYSLINUXCFG} | 57 | echo "LABEL boot" >> ${SYSLINUX_CFG} |
58 | echo " KERNEL mboot.c32" >> ${SYSLINUXCFG} | 58 | echo " KERNEL mboot.c32" >> ${SYSLINUX_CFG} |
59 | echo " APPEND /xen.gz ${SYSLINUX_XEN_ARGS} --- /vmlinuz ${SYSLINUX_KERNEL_ARGS} --- /initrd" >> ${SYSLINUXCFG} | 59 | echo " APPEND /xen.gz ${SYSLINUX_XEN_ARGS} --- /vmlinuz ${SYSLINUX_KERNEL_ARGS} --- /initrd" >> ${SYSLINUX_CFG} |
60 | } | 60 | } |
61 | 61 | ||