linux/poky.git/scripts/lib/wic, branch 2.3_M2

isoimage-isohybrid: renamed variable hdd_dir

2017-01-31T14:38:32+00:00

Renamed variable hdd_dir to deploy_dir as this variable is assigned to the value of DEPLOY_DIR_IMAGE. (From OE-Core rev: fc84893c319f3e8c72f13c58f25e0b54095c3a49) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH

2017-01-31T14:38:32+00:00

isoimage-sihybrid plugin uses MACHINE_ARCH to get the name of initrd image. It doesn't work for all machines, for example for quemux86-64 machine MACHINE_ARCH is quemux86_64 and initrd name is core-image-minimal-initramfs-qemux86-64.cpio.gz Used TRANSLATED_TARGET_ARCH variable to get the initrd image name. Replaced MACHINE_ARCH->TRANSLATED_TARGET_ARCH in WICVARS variable to make it available from .env file. (From OE-Core rev: edf0830412de66eada9ef3f3947ca42e301c5377) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: Look for image artifacts in a common location

2017-01-31T14:38:32+00:00

Rather than have each image type look for artifacts in image-specific locations, move towards having them look for artifacts in a common location, in this case DEPLOY_DIR_IMAGE Use the existing deploy.bbclass to have the bootloaders put their binaries in DEPLOY_DIR_IMAGE and then wic will find them and place them in the image (From OE-Core rev: 1c8acea91e775b1b6f8b25e774aaba3e790fc59b) Signed-off-by: Alejandro Hernandez Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie

wic: isoimage-isohybrid: stop using HDDDIR

2017-01-31T14:38:32+00:00

Stop using HDDDIR in isoimage-isohybrid wic plugin. This variable is set by hddimg code, which is going to be removed soon. All required artifacts should be available from ISODIR. wic-image.bbclass has been modified to build iso artifacts, so it should be safe to remove usage of HDDDIR. [YOCTO #10835] (From OE-Core rev: 4ceb0df10db7254b290784cabc5279ffa2b946a4) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: use INITRD_LIVE in isoimage-isohybrid

2017-01-31T14:38:32+00:00

INITRD variable is not set if hddimg is disabled. isoimage-isohybrid can't get correct name for initrd if INITRD variable is not set. Added INITRD_LIVE to WICVARS and used it in isoimage-isohybrid code to get initrd artifact name. Used INITRD if INITRD_LIVE is not set. (From OE-Core rev: c672753be60550b15d5d593c251b61776d5b104d) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: partitionedfs: set partition name for gpt partitions

2017-01-31T14:38:32+00:00

Set proper gpt partition name for the partitions in case given in the configuration (From OE-Core rev: bc6e6a34f35bd081d828160bab8ee12e770c7e1e) Signed-off-by: Jukka Laitinen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

wic: direct.py: get rid of names with two underscores

2017-01-31T14:38:32+00:00

Attributes with two leading underscores are mangled in Python and used mainly for avoiding name clashes with names from subclasses. They're not needed in most of wic classes. (From OE-Core rev: 2f92c0490f1acf5a6926fc6654ce3b6588ddcc24) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: remove unused API DirectImageCreator.get_disk_names

2017-01-31T14:38:31+00:00

(From OE-Core rev: f77efbe81a5d3d16ecb1872cf237bb3e56c63c39) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: make workdir a temporary directory

2017-01-31T14:38:31+00:00

Wic used hardcoded path /var/tmp/wic/ as a work directory, which caused conflicts if two wic instances run in parallel. Made work directory unique and temporary. Moved results from work directory to output directory when they're ready. [YOCTO #10783] (From OE-Core rev: 5d948f04823dedfa26a879aa6a5dc23de2bb9354) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

wic: get rid of baseimager inheritance

2017-01-31T14:38:31+00:00

Simplified DirectImageCreator code by removing inheritance from BaseImageCreator. This inheritance doesn't make much sense as DirectImageCreator is the only class that was inherited from BaseImageCreator. (From OE-Core rev: 4e9952514211ef4b9a3731ce915090385f335a31) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie