It seem to be INITRD_IMAGE_LIVE now. http://patchwork.openembedded.org/patch/116335/
2016-06-22 11:20 GMT-03:00 Robert P. J. Day <[email protected]>: > On Wed, 22 Jun 2016, Daniel. wrote: > >> Well I'm in Daisy and I can see that variable, so I think that the >> documentation is out of date :) >> >> [geckos@csi24 yocto-daisy]$ find sources/ -name "*.bb*" -exec grep >> --color -H INITRD_IMAGE {} \; >> sources/poky/meta/recipes-extended/images/core-image-testmaster.bb:INITRD_IMAGE >> = "core-image-testmaster-initramfs" >> sources/poky/meta/classes/image-live.bbclass:INITRD_IMAGE ?= >> "core-image-minimal-initramfs" >> sources/poky/meta/classes/image-live.bbclass:INITRD ?= >> "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" >> sources/poky/meta/classes/image-live.bbclass:do_bootimg[depends] += >> "${INITRD_IMAGE}:do_rootfs" >> [geckos@csi24 yocto-daisy]$ > > it looks like there was a shift from INITRD_IMAGE to one of > INITRD_IMAGE_VM or INITRD_IMAGE_LIVE on feb 24, 2016 in this commit in > oe-core: > > commit e38c94d6bf83ed3ca7f046d9503e81b927487bf2 > Author: Robert Yang <[email protected]> > Date: Wed Feb 24 01:23:58 2016 -0800 > > syslinux.bbclass: make vm and live can be built together > > * The vm image(hdddirect, vmdk, qcow2, vdi) and live image (hddimg, iso) > couldn't be built together because the following vars settings are > conflicted: > - SYSLINUX_ROOT (/dev/sda2 vs /dev/ram0) > - LABELS (boot vs boot install) > - INITRD (None vs live install) > - SYSLINUX_CFG (see above) > Introduce new vars (SYSLINUX_ROOT_VM/_LIVE, the samilar to others) to > make them can work together, now we can build all of them together: > > IMAGE_FSTYPES += "live iso hddimg hdddirect vmdk qcow2 vdi" > > * Use SYSLINUX_CFG rather than SYSLINUXCFG to keep align with others > SYSLINUX vars. > > * The SYSLINUX_TIMEOUT had been set, but it didn't work since > AUTO_SYSLINUXMENU wasn't set, this would cause confusions, so also set > AUTO_SYSLINUXMENU. > > * Move SYSLINUX_PROMPT and SYSLINUX_TIMEOUT to syslinux.bbclass rather > than in separate classes since they are the same. > > * Set SYSLINUX_TIMEOUT to 50 to have a unique timeout for syslinux. > > [YOCTO #9161] > > Signed-off-by: Robert Yang <[email protected]> > Signed-off-by: Ross Burton <[email protected]> > > and i guess someone just didn't notice the remaining references to > INITRD_IMAGE. > > rday > > -- > > ======================================================================== > Robert P. J. Day Ottawa, Ontario, CANADA > http://crashcourse.ca > > Twitter: http://twitter.com/rpjday > LinkedIn: http://ca.linkedin.com/in/rpjday > ======================================================================== > -- "Do or do not. There is no try" Yoda Master -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
