Added 4 new testcases for 'wic --compress-with compressor' functionality.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 47b70fd..5385562 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest
Added 'compressor' argument to wic_create to pass a name of
compressor utility to the wic engine.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 29099ee..047c40d 100644
--- a/scripts/lib/image/engine.py
+++ b
Added 'compressor' argument to Direct plugin API to
pass a name of compressor utility.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 047c40d..d5c34b4 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib
Added -c/--compress-with command line option to 'wic create'
subcommand. This option is used to specify compressor
utility to compress the image produced by wic. gzip, bzip2 and
xz compressors are supported in this implementation.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git
.
Fixes [YOCTO #7593]
Note: This patchset depends on poky-contrib:ed/wic/misc
Ed Bartosh (6):
wic: Add --compress-with command line option
wic: Add new argument to wic_create function
wic: Add new argument to direct plugin
wic: Implement image compressing
wic: Make code more pythonic
wic: oe
Increased syslinux timeout to 5s as 1s default 1s timeout
is not enough to notice syslinux prompt on some devices.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
meta/classes/image-live.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image
This is a part of the work to support partiion UUID in installer.
gptdisk is going to be used to get partition UUID.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | 2 +-
meta/recipes-core/initrdscripts/initramfs-live
.
Used partition UUID in kernel command line to specify root partition.
Used partition UUID in /etc/fstab to specify boot and swap partitions.
[YOCTO #6101]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
.../recipes-core/initrdscripts/files/init-install-efi.sh | 16
1
Added short explanation of how to create empty pattition
to the 'wic help kickstart' command output.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/image/help.py | 4
1 file changed, 4 insertions(+)
diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py
Added short explanation of how to create empty pattition
to the 'wic help kickstart' output.
[YOCTO #7131]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/image/help.py | 4
1 file changed, 4 insertions(+)
diff --git a/scripts/lib/image/help.py b/scripts/lib/image
Return 1 if command doesn't exist or wic is called without
any commmand.
Return result of invoke_command as wic return code.
Added tests for unsupported command and no command.
Fixed typo in test case test02_createhelp spotted by this fix.
[YOCTO #7856]
Signed-off-by: Ed Bartosh ed.bart
Fixed wrong name for the first argument in class methods.
Pylint complains about the issue this way:
Class method should have 'cls' as first argument
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/wic/pluginbase.py | 8
scripts/lib/wic
Removed unncecessary parents after 'if' 'del' and 'print' keywords.
Fixed pyling warning: Unnecessary parens after 'xxx' keyword
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/image/engine.py| 6 +++---
scripts/lib/image/help.py
Docstings from plugin classes are used as part of
output of 'wic help plugins'. Adding them makes help page
more informative.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/wic/plugins/imager/direct_plugin.py | 9 +
scripts/lib/wic/plugins/source/bootimg-efi.py
Added mechanism to show docstrings of plugin classes as a part of
plugins help page.
For missing plugins the following warning message is shown:
class 'plugin class spec' is missing docstring.
[YOCTO #7118]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/image/help.py | 18
Removed -i/--infile wic command line option.
Removed properties_file and properties arguments of
wic_create function.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/image/engine.py | 7 ++-
scripts/wic | 8 +++-
2 files changed, 5 insertions(+), 10
Cleaned up spaces from init-install* shell scripts.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index a6a8679..dca1432 100644
--- a/meta/recipes-core
Shortened code by including /dev/ prefix into variable.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index dca1432..74372b0 100644
--- a/meta/recipes-core
Explicitly specified filesystem type for parted mkpart command.
This makes partition table to look more informative.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install
parted allows to use names for partitions if GPT partition table
is used on the device. msdos partitioning can have only partition
types: 'primary', 'logical' or 'extended'.
Used meaningful partition names in parted command line for GPT
partitioning.
Signed-off-by: Ed Bartosh ed.bart
.
Used partition UUID in kernel command line to specify root partition.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core
Added util-linux-blkid to the list of dependencies of
initramfs-live-install and initramfs-live-install-efi.
This is a part of the work to support partiion UUID in installer.
blkid is going to be used to get partition and filesystem UUIDs.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
Used partition UUID in kernel command line to specify root partition.
Searched root device by file system uuid in GRUB configuration.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh
included into the
patchset:
[OE-core] [PATCH] image-live: Set syslinux timeout to 5s
[OE-core] [PATCH] initramfs-live-install: Add gptdisk to initramfs
[OE-core] [PATCH] init-install-efi: Implement UUID support
Please review
Ed Bartosh (10):
image-live: Set syslinux timeout to 5s
Changed partition type from 'msdos' to 'gpt'.
Added special partition for grub stage2 bootloader.
NOTE: This is done only for GRUB 2 as legacy GRUB is
rarely used and doesn't support GPT partitions.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core
Enabled MOUNT_LABEL and VOLUMEID* features for busybox
mount to understand 'UUID=' syntax in fstab.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/busybox/busybox/defconfig
b/meta/recipes-core/busybox/busybox/defconfig
index c200ee0..468c40e 100644
Increased syslinux timeout to 5s as default 1s timeout
is not enough to notice syslinux prompt on some devices.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 7b770fb..52b6de7 100644
--- a/meta/classes
Fixed test05_build_artifacts testcase by using values of MACHINE
and BUILD_SYS bitbake variables in paths to artifacts.
Test was failing because of hardcoded machine(qemux86) and
build_sys(qemux86-poky-linux) in artifact paths.
[YOCTO #7730]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
parted allows to use names for partitions if GPT partition table
is used on the device. msdos partitioning can have only partition
types: 'primary', 'logical' or 'extended'.
Used meaningful partition names in parted command line for GPT
partitioning.
Signed-off-by: Ed Bartosh ed.bart
Shortened code by including /dev/ prefix into variable.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index dca1432..74372b0 100644
--- a/meta/recipes-core
Explicitly specified filesystem type for parted mkpart command.
This makes partition table to look more informative.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install
.
Used partition UUID in kernel command line to specify root partition.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core
Cleaned up spaces from init-install* shell scripts.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index a6a8679..dca1432 100644
--- a/meta/recipes-core
Increased syslinux timeout to 5s as default 1s timeout
is not enough to notice syslinux prompt on some devices.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 7b770fb..52b6de7 100644
--- a/meta/classes
included into the
patchset:
[OE-core] [PATCH] image-live: Set syslinux timeout to 5s
[OE-core] [PATCH] initramfs-live-install: Add gptdisk to initramfs
[OE-core] [PATCH] init-install-efi: Implement UUID support
Ed Bartosh (11):
image-live: Set syslinux timeout to 5s
initramfs-live
Changed partition type from 'msdos' to 'gpt'.
Added special partition for grub stage2 bootloader.
NOTE: This is done only for GRUB 2 as legacy GRUB is
rarely used and doesn't support GPT partitions.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core
Fixed deletion of the partition table by increasing
amount of sectors from 2(correct for msdos PT) to 35 as
GPT size is 34 sectors + 1 sector for protective MBR.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta
Used partition UUID in kernel command line to specify root partition.
Searched root device by file system uuid in GRUB configuration.
Used partition UUID in /etc/fstab to specify swap partition.
Used filesystem UUID in /etc/fstab to specify boot partition.
[YOCTO #6101]
Signed-off-by: Ed Bartosh
Enabled MOUNT_LABEL and VOLUMEID* features for busybox
mount to understand 'UUID=' syntax in fstab.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/recipes-core/busybox/busybox/defconfig
b/meta/recipes-core/busybox/busybox/defconfig
index c200ee0..468c40e 100644
Added util-linux-blkid to the list of dependencies of
initramfs-live-install and initramfs-live-install-efi.
This is a part of the work to support partiion UUID in installer.
blkid is going to be used to get partition and filesystem UUIDs.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
Printing only first 5 levels of wic traceback makes it almost
useless as the most valuable part of it is stripped.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/wic | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/wic b/scripts/wic
index 1e07dfe
standard
python traceback.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/wic/utils/errors.py | 34 --
scripts/wic | 11 +--
2 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/scripts/lib/wic/utils
Only msdos partition table format was supported by wic source
plugins.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py
b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 2fc0357..22c7b0a 100644
--- a/scripts/lib/wic/plugins
Used proper syslinux MBR gptmbr.bin for GPT partitons.
Added check for unsupported partition formats.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index c28b9af..ab62b7a
directdisk-gpt is the same as directdisk with only one difference:
it uses GPT partition table.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
create mode 100644 scripts/lib/image/canned-wks/directdisk-gpt.wks
diff --git a/scripts/lib/image/canned-wks/directdisk-gpt.wks
b/scripts/lib
Names with one leasding underscore considered protected in Python.
_ptable_format is accessed outside of its class.
Made it public by removing underscore.
This pylint warning should be fixed now:
Access to a protected member _ptable_format of a client class
Signed-off-by: Ed Bartosh ed.bart
This flag is used to tell special purpose software that
the GPT partition may be bootable.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/partitionedfs.py
b/scripts/lib/wic/utils/partitionedfs.py
index 1c9e3ea..06d4eac 100644
--- a/scripts/lib/wic/utils
Specifying partition type(GUID) makes sense for gpt partition table.
Current code checks if part-type is specified and throws exception
if it is. This makes sense to do only for msdos partition table.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils
Hi,
This is a set of fixes for GPT partition table support in wic.
Added new canned .wks and correspondent testcase were added to the codebase.
Result direct-gpt core-minimal image was successfully booted on NUC.
Ed Bartosh (7):
wic: set legacy_boot flag for gpt partitions
wic: check
Added new wic testcase to the sute - creation of directdisk-gpt
image.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index a2ce2cb..e97dd1d 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest
Fixed pylint warning unused-import
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 0dc7920..73e8f8b 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -30,18 +30,10 @@
import os
Moved duplicated code of geting rootfs size
out of prepare_rootfs* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 4e8a6a8..72f617a 100644
Added --uuid option to the configuration of wks parser.
This option specifies partition UUID. The code to process
it is already in place. It was implemented for --use-uuid
option.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/help.py b/scripts/lib/image
the message looks like this:
The following build artifacts are not specified:
bootimg-dir, kernel-dir, native-sysroot
[YOCTO #7912]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/wic b/scripts/wic
index b75d122..ac272c6 100755
--- a/scripts/wic
+++ b/scripts/wic
Made the code to backup and restore fstab only if it's modified.
Cleaned up the code. Made it more pythonic.
Improved code readability by moving code from several tiny
methods into one place.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/imager/direct.py b
Moved code out of prepare_empty_partition* methods
to avoid code duplication.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 0741bb2..4e8a6a8 100644
Shortened code by using getattr to obtain a method to call for
prepare_empty_partition_* and prepare_rootfs_* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands
Image file name is not unique for the partitions without label.
This causes image being rewritten and used as a source for all
partitions without label. Wic produces broken or incorrect result
images because of that.
Added wks line number to the image name to make it unique.
Signed-off-by: Ed
Moved code of __write_partition to 'assemble' method.
This way it should be more readable.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/partitionedfs.py
b/scripts/lib/wic/utils/partitionedfs.py
index d61087a..ca4b1f0 100644
--- a/scripts/lib/wic/utils
Added canned wks and testcase to create multi-rootfs images referring
bitbake image recipes.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
create mode 100644 scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest
Wic tries to find plugins in every layer and prints a message
'Plugin dir is not a directory or does not exist' if layer
doesn't have plugin dir. It causes a lot of duplicated
messages in the debug output, which makes it hard to find
useful info there.
Signed-off-by: Ed Bartosh ed.bart
Removed useless variable 'image_rootfs' from 4 prepare_rootfs_* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 489ebe3..e3ae3ce 100644
--- a/scripts
Renamed partition images into final image.ppartition number
This should make output directory look more organized and easier
to understand.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/partitionedfs.py
b/scripts/lib/wic/utils/partitionedfs.py
index
to Christopher Larson to
point that out to me
- added one indentation fix
Ed Bartosh (20):
wic: Fix misleading message
wic: Test rootfs plugin using image recipes
wic: Test rootfs plugin using rootfs paths
wic: Refactor getting bitbake variables
wic: Include mount point into image report
wic
Added testcase to create multi-rootfs images using rootfs plugin
with paths to rootfs directories in wic command line.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 3cfc2ff..0c503ef 100644
--- a/meta/lib/oeqa
Moved code out of prepare_roots* methods to avoid code duplication.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 324ea69..489ebe3 100644
--- a/scripts/lib
Switched debug level to 'normal' to prevent huge 'bitbake -e'
output to go into wic debug output. This should help to make
wic debug info much more clean and easier to read.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils
per requested set of variables.
get_bitbake_var became the only API call. It replaces find_artifacts,
find_artifact, find_bitbake_env_lines, get_bitbake_env_lines,
set_bitbake_env_lines and get_line_val calls making API much more clear.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff
Wic doesn't show any information for the partition if label is not set.
Fixed this by adding mount point to the report.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 2ea7e4e..58a9e9d 100644
Due to usage of incorrect variable wic produces strange message
No image named None found, exiting. when specified canned .wks
doesn't exist.
Fixed by replacing wks_file - argv[0]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/wic b/scripts/wic
index f9be972..a39ec95
Fixed pylint warnings bad-continuation, bad-continuation and
line-too-long.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 92dcc5a..0dc7920 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image
Hi Cristopher,
On Mon, Jun 29, 2015 at 02:48:30PM -0700, Christopher Larson wrote:
On Mon, Jun 29, 2015 at 12:10 PM, Ed Bartosh ed.bart...@linux.intel.com
wrote:
+global _BITBAKE_VARS
+
+if image not in _BITBAKE_VARS:
In general, I’d suggest using a cache class/object
Fixed pylint warnings bad-continuation, bad-continuation and
line-too-long.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 92dcc5a..0dc7920 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image
Fixed pylint warning unused-import
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 0dc7920..73e8f8b 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -30,18 +30,10 @@
import os
per requested set of variables.
get_bitbake_var became the only API call. It replaces find_artifacts,
find_artifact, find_bitbake_env_lines, get_bitbake_env_lines,
set_bitbake_env_lines and get_line_val calls making API much more clear.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff
Renamed partition images into final image.ppartition number
This should make output directory look more organized and easier
to understand.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/partitionedfs.py
b/scripts/lib/wic/utils/partitionedfs.py
index
Wic tries to find plugins in every layer and prints a message
'Plugin dir is not a directory or does not exist' if layer
doesn't have plugin dir. It causes a lot of duplicated
messages in the debug output, which makes it hard to find
useful info there.
Signed-off-by: Ed Bartosh ed.bart
Hi,
This patchset includes usability fixes, new functionality,
code cleanup, refactoring and 2 new test cases for wic.
The work was done during verification of multi-rootfs EFI images.
Fixes YOCTO #7854 and #7912
Ed Bartosh (20):
wic: Fix misleading message
wic: Test rootfs plugin using
Shortened code by using getattr to obtain a method to call for
prepare_empty_partition_* and prepare_rootfs_* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands
Added testcase to create multi-rootfs images using rootfs plugin
with paths to rootfs directories in wic command line.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 3cfc2ff..0c503ef 100644
--- a/meta/lib/oeqa
Due to usage of incorrect variable wic produces strange message
No image named None found, exiting. when specified canned .wks
doesn't exist.
Fixed by replacing wks_file - argv[0]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/wic b/scripts/wic
index f9be972..a39ec95
Wic doesn't show any information for the partition if label is not set.
Fixed this by adding mount point to the report.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 2ea7e4e..58a9e9d 100644
Added canned wks and testcase to create multi-rootfs images referring
bitbake image recipes.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
create mode 100644 scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest
Added --uuid option to the configuration of wks parser.
This option specifies partition UUID. The code to process
it is already in place. It was implemented for --use-uuid
option.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/image/help.py b/scripts/lib/image
Moved code out of prepare_roots* methods to avoid code duplication.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 324ea69..489ebe3 100644
--- a/scripts/lib
Moved code out of prepare_empty_partition* methods
to avoid code duplication.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 0741bb2..4e8a6a8 100644
Moved code of __write_partition to 'assemble' method.
This way it should be more readable.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/partitionedfs.py
b/scripts/lib/wic/utils/partitionedfs.py
index d61087a..ca4b1f0 100644
--- a/scripts/lib/wic/utils
the message looks like this:
The following build artifacts are not specified:
bootimg-dir, kernel-dir, native-sysroot
[YOCTO #7912]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/wic b/scripts/wic
index b75d122..ac272c6 100755
--- a/scripts/wic
+++ b/scripts/wic
Made the code to backup and restore fstab only if it's modified.
Cleaned up the code. Made it more pythonic.
Improved code readability by moving code from several tiny
methods into one place.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/imager/direct.py b
Moved duplicated code of geting rootfs size
out of prepare_rootfs* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 4e8a6a8..72f617a 100644
Image file name is not unique for the partitions without label.
This causes image being rewritten and used as a source for all
partitions without label. Wic produces broken or incorrect result
images because of that.
Added wks line number to the image name to make it unique.
Signed-off-by: Ed
Removed useless variable 'image_rootfs' from 4 prepare_rootfs_* methods.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py
b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 489ebe3..e3ae3ce 100644
--- a/scripts
Switched debug level to 'normal' to prevent huge 'bitbake -e'
output to go into wic debug output. This should help to make
wic debug info much more clean and easier to read.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils
Some native tools (syslinux, parted, mtools, etc) are required
by wic to produce images. Unit tests fail if the tools are
not available.
Baked tools and image-core-minimal used by wic before running tests.
[YOCTO #7730]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
meta/lib/oeqa
Some native tools (syslinux, parted, mtools, etc) are required
by wic to produce images. Unit tests fail if the tools are
not available.
Baked tools and image-core-minimal used by wic before running tests.
[YOCTO #7730]
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
meta/lib/oeqa
, IMAGE_ROOTFS_ALIGNMENT, IMAGE_OVERHEAD_FACTOR
and IMAGE_ROOTFS_EXTRA_SPACE.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/wic/imager/direct.py | 14 ++
1 file changed, 14 insertions(+)
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 57b1335
Added test case to check if image.env file is generated
and contains bitbake variables used in wic code.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
meta/lib/oeqa/selftest/wic.py | 20
1 file changed, 20 insertions(+)
diff --git a/meta/lib/oeqa/selftest/wic.py
)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/wic/wic-image-type
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wic-image-type
Ed Bartosh (17):
image.py: write bitbake variables to .env file
oe-selftest: test generation of image.env
wic
Moved code that parses one line of 'bitbake -e' output
to separate method _parse_line.
This method will be also used later to parse lines of .env files.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/lib/wic/utils/oe/misc.py | 27 +--
1 file changed, 17
Set BitbakeVars.default_image when wic is called with -e option.
This makes get_bitbake_var API to use provided image as a default
source of variables.
Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com
---
scripts/wic | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
101 - 200 of 1320 matches
Mail list logo
