mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: adjust code for new data structure

Browse Source 
New data structure is less nested than old one.
Adjusted bootloader and partitions fields:
self.ks.handler.bootloader -> self.ks.bootoader
self.ks.handler.partitions -> self.ks.partitions

(From OE-Core rev: b46da0731e3f7016d0ab2a67967f07c7e199f219)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2016-01-14 14:12:55 +02:00
committed by Richard Purdie
parent c8272380ce
commit 26fb2a1a45
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/wic/imager/baseimager.py
View File

@@ -85,7 +85,7 @@ class BaseImageCreator(object):
# No ks provided when called by convertor, so skip the dependency check
if self.ks:
# If we have btrfs partition we need to check necessary tools
for part in self.ks.handler.partition.partitions:
for part in self.ks.partitions:
if part.fstype and part.fstype == "btrfs":
self._dep_checks.append("mkfs.btrfs")
break

16
scripts/lib/wic/imager/direct.py
View File

@@ -64,7 +64,7 @@ class DirectImageCreator(BaseImageCreator):
self.__disks = {}
self.__disk_format = "direct"
self._disk_names = []
self.ptable_format = self.ks.handler.bootloader.ptable
self.ptable_format = self.ks.bootloader.ptable
self.oe_builddir = oe_builddir
if image_output_dir:
@@ -151,12 +151,12 @@ class DirectImageCreator(BaseImageCreator):
"please check your kickstart setting.")
# Set a default partition if no partition is given out
if not self.ks.handler.partition.partitions:
if not self.ks.partitions:
partstr = "part / --size 1900 --ondisk sda --fstype=ext3"
args = partstr.split()
part = self.ks.handler.partition.parse(args[1:])
if part not in self.ks.handler.partition.partitions:
self.ks.handler.partition.partitions.append(part)
part = self.ks.parse(args[1:])
if part not in self.ks.partitions:
self.ks.partitions.append(part)
# partitions list from kickstart file
return kickstart.get_partitions(self.ks)
@@ -206,7 +206,7 @@ class DirectImageCreator(BaseImageCreator):
bootloader object, the default can be explicitly set using the
--source bootloader param.
"""
return self.ks.handler.bootloader.source
return self.ks.bootloader.source
#
# Actual implemention
@@ -224,8 +224,8 @@ class DirectImageCreator(BaseImageCreator):
for part in parts:
# as a convenience, set source to the boot partition source
# instead of forcing it to be set via bootloader --source
if not self.ks.handler.bootloader.source and part.mountpoint == "/boot":
self.ks.handler.bootloader.source = part.source
if not self.ks.bootloader.source and part.mountpoint == "/boot":
self.ks.bootloader.source = part.source
fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))

2
scripts/lib/wic/plugins/source/bootimg-efi.py
View File

@@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin):
if not custom_cfg:
# Create grub configuration using parameters from wks file
options = creator.ks.handler.bootloader.appendLine
bootloader = creator.ks.bootloader
grubefi_conf = ""
grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n"

4
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
View File

@@ -78,7 +78,7 @@ class RootfsPlugin(SourcePlugin):
Called before do_prepare_partition()
"""
options = image_creator.ks.handler.bootloader.appendLine
bootloader = image_creator.ks.bootloader
syslinux_conf = ""
syslinux_conf += "PROMPT 0\n"
@@ -97,7 +97,7 @@ class RootfsPlugin(SourcePlugin):
syslinux_conf += " KERNEL /boot/bzImage\n"
syslinux_conf += " APPEND label=boot root=%s %s\n" % \
(image_creator.rootdev, options)
(image_creator.rootdev, bootloader.append)
syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg")
msger.debug("Writing syslinux config %s" % syslinux_cfg)