Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
create-combined-dtb: Add dependency on virtual/kernel
[AGL/meta-agl.git]
/
meta-netboot
/
classes
/
netboot.bbclass
diff --git
a/meta-netboot/classes/netboot.bbclass
b/meta-netboot/classes/netboot.bbclass
index
0bb2452
..
363e6bc
100644
(file)
--- a/
meta-netboot/classes/netboot.bbclass
+++ b/
meta-netboot/classes/netboot.bbclass
@@
-1,26
+1,22
@@
# Enable network bootable image and initrd/initramfs
# Enable network bootable image and initrd/initramfs
-# add image classes for uboot
-IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}"
-
python () {
python () {
- d.appendVar("IMAGE_FSTYPES"," ext4")
-
- if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d)):
+ if (bb.utils.contains_any("IMAGE_FSTYPES",["live","wic.vmdk"],True,False,d)):
# typical case for Minnowboard Max
d.setVar("INITRD_IMAGE","initramfs-netboot-image")
# typical case for Minnowboard Max
d.setVar("INITRD_IMAGE","initramfs-netboot-image")
- d.setVar("INITRD","%s/%s-%s.ext4.gz" % (
+ d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True))
+ d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % (
d.getVar("DEPLOY_DIR_IMAGE",True),
d.getVar("DEPLOY_DIR_IMAGE",True),
- d.getVar("INITRD_IMAGE",True),
+ d.getVar("INITRD_IMAGE
_LIVE
",True),
d.getVar("MACHINE",True)
))
else:
d.getVar("MACHINE",True)
))
else:
- d.
appendVar("INITRAMFS_IMAGE","
initramfs-netboot-image")
+ d.
setVar("INITRAMFS_IMAGE","
initramfs-netboot-image")
if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"):
# case for "old" u-boot images, like Porter board
if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"):
# case for "old" u-boot images, like Porter board
- d.
appendVar("INITRAMFS_FSTYPES","
ext4.gz.u-boot");
+ d.
setVar("NETBOOT_FSTYPES", "
ext4.gz.u-boot");
else:
# case for new u-boot images which don't require uImage format
else:
# case for new u-boot images which don't require uImage format
- d.
appendVar("INITRAMFS_FSTYPES","
ext4.gz");
+ d.
setVar("NETBOOT_FSTYPES", "
ext4.gz");
}
}