From 46149a8e0f625f0b2d421812fb4fdeefd8309477 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Wed, 23 Aug 2017 14:43:35 -0700 Subject: [PATCH] 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 git://git.openembedded.org/openembedded-core commit e38c94d6bf83ed3ca7f046d9503e81b927487bf2 git://git.yoctoproject.org/poky.git commit bb1c719250cecc8725147cbdd999a9a44a11b549 Author: Robert Yang Date: Wed Feb 24 01:23:58 2016 -0800 syslinux.bbclass: make vm and live can be built together Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-image-minimal.bb | 14 +++++++------- 1 file 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 SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5" build_syslinux_cfg () { - echo "ALLOWOPTIONS 1" > ${SYSLINUXCFG} - echo "DEFAULT boot" >> ${SYSLINUXCFG} - echo "TIMEOUT 10" >> ${SYSLINUXCFG} - echo "PROMPT 1" >> ${SYSLINUXCFG} - echo "LABEL boot" >> ${SYSLINUXCFG} - echo " KERNEL mboot.c32" >> ${SYSLINUXCFG} - echo " APPEND /xen.gz ${SYSLINUX_XEN_ARGS} --- /vmlinuz ${SYSLINUX_KERNEL_ARGS} --- /initrd" >> ${SYSLINUXCFG} + echo "ALLOWOPTIONS 1" > ${SYSLINUX_CFG} + echo "DEFAULT boot" >> ${SYSLINUX_CFG} + echo "TIMEOUT 10" >> ${SYSLINUX_CFG} + echo "PROMPT 1" >> ${SYSLINUX_CFG} + echo "LABEL boot" >> ${SYSLINUX_CFG} + echo " KERNEL mboot.c32" >> ${SYSLINUX_CFG} + echo " APPEND /xen.gz ${SYSLINUX_XEN_ARGS} --- /vmlinuz ${SYSLINUX_KERNEL_ARGS} --- /initrd" >> ${SYSLINUX_CFG} }