diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 211 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-partition.py | 9 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 12 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/empty.py | 59 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 42 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 13 |
7 files changed, 298 insertions, 50 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index cdc72543c2..7cc5131541 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | import logging | 13 | import logging |
14 | import os | 14 | import os |
15 | import tempfile | ||
15 | import shutil | 16 | import shutil |
16 | import re | 17 | import re |
17 | 18 | ||
@@ -34,6 +35,26 @@ class BootimgEFIPlugin(SourcePlugin): | |||
34 | name = 'bootimg-efi' | 35 | name = 'bootimg-efi' |
35 | 36 | ||
36 | @classmethod | 37 | @classmethod |
38 | def _copy_additional_files(cls, hdddir, initrd, dtb): | ||
39 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | ||
40 | if not bootimg_dir: | ||
41 | raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") | ||
42 | |||
43 | if initrd: | ||
44 | initrds = initrd.split(';') | ||
45 | for rd in initrds: | ||
46 | cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) | ||
47 | exec_cmd(cp_cmd, True) | ||
48 | else: | ||
49 | logger.debug("Ignoring missing initrd") | ||
50 | |||
51 | if dtb: | ||
52 | if ';' in dtb: | ||
53 | raise WicError("Only one DTB supported, exiting") | ||
54 | cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb, hdddir) | ||
55 | exec_cmd(cp_cmd, True) | ||
56 | |||
57 | @classmethod | ||
37 | def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): | 58 | def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): |
38 | """ | 59 | """ |
39 | Create loader-specific (grub-efi) config | 60 | Create loader-specific (grub-efi) config |
@@ -52,18 +73,9 @@ class BootimgEFIPlugin(SourcePlugin): | |||
52 | "get it from %s." % configfile) | 73 | "get it from %s." % configfile) |
53 | 74 | ||
54 | initrd = source_params.get('initrd') | 75 | initrd = source_params.get('initrd') |
76 | dtb = source_params.get('dtb') | ||
55 | 77 | ||
56 | if initrd: | 78 | cls._copy_additional_files(hdddir, initrd, dtb) |
57 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | ||
58 | if not bootimg_dir: | ||
59 | raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") | ||
60 | |||
61 | initrds = initrd.split(';') | ||
62 | for rd in initrds: | ||
63 | cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) | ||
64 | exec_cmd(cp_cmd, True) | ||
65 | else: | ||
66 | logger.debug("Ignoring missing initrd") | ||
67 | 79 | ||
68 | if not custom_cfg: | 80 | if not custom_cfg: |
69 | # Create grub configuration using parameters from wks file | 81 | # Create grub configuration using parameters from wks file |
@@ -97,6 +109,9 @@ class BootimgEFIPlugin(SourcePlugin): | |||
97 | grubefi_conf += " /%s" % rd | 109 | grubefi_conf += " /%s" % rd |
98 | grubefi_conf += "\n" | 110 | grubefi_conf += "\n" |
99 | 111 | ||
112 | if dtb: | ||
113 | grubefi_conf += "devicetree /%s\n" % dtb | ||
114 | |||
100 | grubefi_conf += "}\n" | 115 | grubefi_conf += "}\n" |
101 | 116 | ||
102 | logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", | 117 | logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", |
@@ -118,24 +133,18 @@ class BootimgEFIPlugin(SourcePlugin): | |||
118 | 133 | ||
119 | bootloader = creator.ks.bootloader | 134 | bootloader = creator.ks.bootloader |
120 | 135 | ||
136 | unified_image = source_params.get('create-unified-kernel-image') == "true" | ||
137 | |||
121 | loader_conf = "" | 138 | loader_conf = "" |
122 | loader_conf += "default boot\n" | 139 | if not unified_image: |
140 | loader_conf += "default boot\n" | ||
123 | loader_conf += "timeout %d\n" % bootloader.timeout | 141 | loader_conf += "timeout %d\n" % bootloader.timeout |
124 | 142 | ||
125 | initrd = source_params.get('initrd') | 143 | initrd = source_params.get('initrd') |
144 | dtb = source_params.get('dtb') | ||
126 | 145 | ||
127 | if initrd: | 146 | if not unified_image: |
128 | # obviously we need to have a common common deploy var | 147 | cls._copy_additional_files(hdddir, initrd, dtb) |
129 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | ||
130 | if not bootimg_dir: | ||
131 | raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") | ||
132 | |||
133 | initrds = initrd.split(';') | ||
134 | for rd in initrds: | ||
135 | cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) | ||
136 | exec_cmd(cp_cmd, True) | ||
137 | else: | ||
138 | logger.debug("Ignoring missing initrd") | ||
139 | 148 | ||
140 | logger.debug("Writing systemd-boot config " | 149 | logger.debug("Writing systemd-boot config " |
141 | "%s/hdd/boot/loader/loader.conf", cr_workdir) | 150 | "%s/hdd/boot/loader/loader.conf", cr_workdir) |
@@ -183,11 +192,15 @@ class BootimgEFIPlugin(SourcePlugin): | |||
183 | for rd in initrds: | 192 | for rd in initrds: |
184 | boot_conf += "initrd /%s\n" % rd | 193 | boot_conf += "initrd /%s\n" % rd |
185 | 194 | ||
186 | logger.debug("Writing systemd-boot config " | 195 | if dtb: |
187 | "%s/hdd/boot/loader/entries/boot.conf", cr_workdir) | 196 | boot_conf += "devicetree /%s\n" % dtb |
188 | cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w") | 197 | |
189 | cfg.write(boot_conf) | 198 | if not unified_image: |
190 | cfg.close() | 199 | logger.debug("Writing systemd-boot config " |
200 | "%s/hdd/boot/loader/entries/boot.conf", cr_workdir) | ||
201 | cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w") | ||
202 | cfg.write(boot_conf) | ||
203 | cfg.close() | ||
191 | 204 | ||
192 | 205 | ||
193 | @classmethod | 206 | @classmethod |
@@ -207,6 +220,8 @@ class BootimgEFIPlugin(SourcePlugin): | |||
207 | cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params) | 220 | cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params) |
208 | elif source_params['loader'] == 'systemd-boot': | 221 | elif source_params['loader'] == 'systemd-boot': |
209 | cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) | 222 | cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) |
223 | elif source_params['loader'] == 'uefi-kernel': | ||
224 | pass | ||
210 | else: | 225 | else: |
211 | raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) | 226 | raise WicError("unrecognized bootimg-efi loader: %s" % source_params['loader']) |
212 | except KeyError: | 227 | except KeyError: |
@@ -288,9 +303,107 @@ class BootimgEFIPlugin(SourcePlugin): | |||
288 | kernel = "%s-%s.bin" % \ | 303 | kernel = "%s-%s.bin" % \ |
289 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | 304 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) |
290 | 305 | ||
291 | install_cmd = "install -m 0644 %s/%s %s/%s" % \ | 306 | if source_params.get('create-unified-kernel-image') == "true": |
292 | (staging_kernel_dir, kernel, hdddir, kernel) | 307 | initrd = source_params.get('initrd') |
293 | exec_cmd(install_cmd) | 308 | if not initrd: |
309 | raise WicError("initrd= must be specified when create-unified-kernel-image=true, exiting") | ||
310 | |||
311 | deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | ||
312 | efi_stub = glob("%s/%s" % (deploy_dir, "linux*.efi.stub")) | ||
313 | if len(efi_stub) == 0: | ||
314 | raise WicError("Unified Kernel Image EFI stub not found, exiting") | ||
315 | efi_stub = efi_stub[0] | ||
316 | |||
317 | with tempfile.TemporaryDirectory() as tmp_dir: | ||
318 | label = source_params.get('label') | ||
319 | label_conf = "root=%s" % creator.rootdev | ||
320 | if label: | ||
321 | label_conf = "LABEL=%s" % label | ||
322 | |||
323 | bootloader = creator.ks.bootloader | ||
324 | cmdline = open("%s/cmdline" % tmp_dir, "w") | ||
325 | cmdline.write("%s %s" % (label_conf, bootloader.append)) | ||
326 | cmdline.close() | ||
327 | |||
328 | initrds = initrd.split(';') | ||
329 | initrd = open("%s/initrd" % tmp_dir, "wb") | ||
330 | for f in initrds: | ||
331 | with open("%s/%s" % (deploy_dir, f), 'rb') as in_file: | ||
332 | shutil.copyfileobj(in_file, initrd) | ||
333 | initrd.close() | ||
334 | |||
335 | # Searched by systemd-boot: | ||
336 | # https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-2-efi-unified-kernel-images | ||
337 | install_cmd = "install -d %s/EFI/Linux" % hdddir | ||
338 | exec_cmd(install_cmd) | ||
339 | |||
340 | staging_dir_host = get_bitbake_var("STAGING_DIR_HOST") | ||
341 | target_sys = get_bitbake_var("TARGET_SYS") | ||
342 | |||
343 | objdump_cmd = "%s-objdump" % target_sys | ||
344 | objdump_cmd += " -p %s" % efi_stub | ||
345 | objdump_cmd += " | awk '{ if ($1 == \"SectionAlignment\"){print $2} }'" | ||
346 | |||
347 | ret, align_str = exec_native_cmd(objdump_cmd, native_sysroot) | ||
348 | align = int(align_str, 16) | ||
349 | |||
350 | objdump_cmd = "%s-objdump" % target_sys | ||
351 | objdump_cmd += " -h %s | tail -2" % efi_stub | ||
352 | ret, output = exec_native_cmd(objdump_cmd, native_sysroot) | ||
353 | |||
354 | offset = int(output.split()[2], 16) + int(output.split()[3], 16) | ||
355 | |||
356 | osrel_off = offset + align - offset % align | ||
357 | osrel_path = "%s/usr/lib/os-release" % staging_dir_host | ||
358 | osrel_sz = os.stat(osrel_path).st_size | ||
359 | |||
360 | cmdline_off = osrel_off + osrel_sz | ||
361 | cmdline_off = cmdline_off + align - cmdline_off % align | ||
362 | cmdline_sz = os.stat(cmdline.name).st_size | ||
363 | |||
364 | dtb_off = cmdline_off + cmdline_sz | ||
365 | dtb_off = dtb_off + align - dtb_off % align | ||
366 | |||
367 | dtb = source_params.get('dtb') | ||
368 | if dtb: | ||
369 | if ';' in dtb: | ||
370 | raise WicError("Only one DTB supported, exiting") | ||
371 | dtb_path = "%s/%s" % (deploy_dir, dtb) | ||
372 | dtb_params = '--add-section .dtb=%s --change-section-vma .dtb=0x%x' % \ | ||
373 | (dtb_path, dtb_off) | ||
374 | linux_off = dtb_off + os.stat(dtb_path).st_size | ||
375 | linux_off = linux_off + align - linux_off % align | ||
376 | else: | ||
377 | dtb_params = '' | ||
378 | linux_off = dtb_off | ||
379 | |||
380 | linux_path = "%s/%s" % (staging_kernel_dir, kernel) | ||
381 | linux_sz = os.stat(linux_path).st_size | ||
382 | |||
383 | initrd_off = linux_off + linux_sz | ||
384 | initrd_off = initrd_off + align - initrd_off % align | ||
385 | |||
386 | # https://www.freedesktop.org/software/systemd/man/systemd-stub.html | ||
387 | objcopy_cmd = "%s-objcopy" % target_sys | ||
388 | objcopy_cmd += " --enable-deterministic-archives" | ||
389 | objcopy_cmd += " --preserve-dates" | ||
390 | objcopy_cmd += " --add-section .osrel=%s" % osrel_path | ||
391 | objcopy_cmd += " --change-section-vma .osrel=0x%x" % osrel_off | ||
392 | objcopy_cmd += " --add-section .cmdline=%s" % cmdline.name | ||
393 | objcopy_cmd += " --change-section-vma .cmdline=0x%x" % cmdline_off | ||
394 | objcopy_cmd += dtb_params | ||
395 | objcopy_cmd += " --add-section .linux=%s" % linux_path | ||
396 | objcopy_cmd += " --change-section-vma .linux=0x%x" % linux_off | ||
397 | objcopy_cmd += " --add-section .initrd=%s" % initrd.name | ||
398 | objcopy_cmd += " --change-section-vma .initrd=0x%x" % initrd_off | ||
399 | objcopy_cmd += " %s %s/EFI/Linux/linux.efi" % (efi_stub, hdddir) | ||
400 | |||
401 | exec_native_cmd(objcopy_cmd, native_sysroot) | ||
402 | else: | ||
403 | if source_params.get('install-kernel-into-boot-dir') != 'false': | ||
404 | install_cmd = "install -m 0644 %s/%s %s/%s" % \ | ||
405 | (staging_kernel_dir, kernel, hdddir, kernel) | ||
406 | exec_cmd(install_cmd) | ||
294 | 407 | ||
295 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES"): | 408 | if get_bitbake_var("IMAGE_EFI_BOOT_FILES"): |
296 | for src_path, dst_path in cls.install_task: | 409 | for src_path, dst_path in cls.install_task: |
@@ -312,6 +425,28 @@ class BootimgEFIPlugin(SourcePlugin): | |||
312 | for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: | 425 | for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: |
313 | cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) | 426 | cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:]) |
314 | exec_cmd(cp_cmd, True) | 427 | exec_cmd(cp_cmd, True) |
428 | elif source_params['loader'] == 'uefi-kernel': | ||
429 | kernel = get_bitbake_var("KERNEL_IMAGETYPE") | ||
430 | if not kernel: | ||
431 | raise WicError("Empty KERNEL_IMAGETYPE") | ||
432 | target = get_bitbake_var("TARGET_SYS") | ||
433 | if not target: | ||
434 | raise WicError("Empty TARGET_SYS") | ||
435 | |||
436 | if re.match("x86_64", target): | ||
437 | kernel_efi_image = "bootx64.efi" | ||
438 | elif re.match('i.86', target): | ||
439 | kernel_efi_image = "bootia32.efi" | ||
440 | elif re.match('aarch64', target): | ||
441 | kernel_efi_image = "bootaa64.efi" | ||
442 | elif re.match('arm', target): | ||
443 | kernel_efi_image = "bootarm.efi" | ||
444 | else: | ||
445 | raise WicError("UEFI stub kernel is incompatible with target %s" % target) | ||
446 | |||
447 | for mod in [x for x in os.listdir(kernel_dir) if x.startswith(kernel)]: | ||
448 | cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, kernel_efi_image) | ||
449 | exec_cmd(cp_cmd, True) | ||
315 | else: | 450 | else: |
316 | raise WicError("unrecognized bootimg-efi loader: %s" % | 451 | raise WicError("unrecognized bootimg-efi loader: %s" % |
317 | source_params['loader']) | 452 | source_params['loader']) |
@@ -323,6 +458,11 @@ class BootimgEFIPlugin(SourcePlugin): | |||
323 | cp_cmd = "cp %s %s/" % (startup, hdddir) | 458 | cp_cmd = "cp %s %s/" % (startup, hdddir) |
324 | exec_cmd(cp_cmd, True) | 459 | exec_cmd(cp_cmd, True) |
325 | 460 | ||
461 | for paths in part.include_path or []: | ||
462 | for path in paths: | ||
463 | cp_cmd = "cp -r %s %s/" % (path, hdddir) | ||
464 | exec_cmd(cp_cmd, True) | ||
465 | |||
326 | du_cmd = "du -bks %s" % hdddir | 466 | du_cmd = "du -bks %s" % hdddir |
327 | out = exec_cmd(du_cmd) | 467 | out = exec_cmd(du_cmd) |
328 | blocks = int(out.split()[0]) | 468 | blocks = int(out.split()[0]) |
@@ -337,6 +477,13 @@ class BootimgEFIPlugin(SourcePlugin): | |||
337 | logger.debug("Added %d extra blocks to %s to get to %d total blocks", | 477 | logger.debug("Added %d extra blocks to %s to get to %d total blocks", |
338 | extra_blocks, part.mountpoint, blocks) | 478 | extra_blocks, part.mountpoint, blocks) |
339 | 479 | ||
480 | # required for compatibility with certain devices expecting file system | ||
481 | # block count to be equal to partition block count | ||
482 | if blocks < part.fixed_size: | ||
483 | blocks = part.fixed_size | ||
484 | logger.debug("Overriding %s to %d total blocks for compatibility", | ||
485 | part.mountpoint, blocks) | ||
486 | |||
340 | # dosfs image, created by mkdosfs | 487 | # dosfs image, created by mkdosfs |
341 | bootimg = "%s/boot.img" % cr_workdir | 488 | bootimg = "%s/boot.img" % cr_workdir |
342 | 489 | ||
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 5dbe2558d2..1071d1af3f 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
3 | # | 5 | # |
4 | # DESCRIPTION | 6 | # DESCRIPTION |
@@ -30,6 +32,7 @@ class BootimgPartitionPlugin(SourcePlugin): | |||
30 | """ | 32 | """ |
31 | 33 | ||
32 | name = 'bootimg-partition' | 34 | name = 'bootimg-partition' |
35 | image_boot_files_var_name = 'IMAGE_BOOT_FILES' | ||
33 | 36 | ||
34 | @classmethod | 37 | @classmethod |
35 | def do_configure_partition(cls, part, source_params, cr, cr_workdir, | 38 | def do_configure_partition(cls, part, source_params, cr, cr_workdir, |
@@ -54,12 +57,12 @@ class BootimgPartitionPlugin(SourcePlugin): | |||
54 | else: | 57 | else: |
55 | var = "" | 58 | var = "" |
56 | 59 | ||
57 | boot_files = get_bitbake_var("IMAGE_BOOT_FILES" + var) | 60 | boot_files = get_bitbake_var(cls.image_boot_files_var_name + var) |
58 | if boot_files is not None: | 61 | if boot_files is not None: |
59 | break | 62 | break |
60 | 63 | ||
61 | if boot_files is None: | 64 | if boot_files is None: |
62 | raise WicError('No boot files defined, IMAGE_BOOT_FILES unset for entry #%d' % part.lineno) | 65 | raise WicError('No boot files defined, %s unset for entry #%d' % (cls.image_boot_files_var_name, part.lineno)) |
63 | 66 | ||
64 | logger.debug('Boot files: %s', boot_files) | 67 | logger.debug('Boot files: %s', boot_files) |
65 | 68 | ||
@@ -110,7 +113,7 @@ class BootimgPartitionPlugin(SourcePlugin): | |||
110 | # Use a custom configuration for extlinux.conf | 113 | # Use a custom configuration for extlinux.conf |
111 | extlinux_conf = custom_cfg | 114 | extlinux_conf = custom_cfg |
112 | logger.debug("Using custom configuration file " | 115 | logger.debug("Using custom configuration file " |
113 | "%s for extlinux.cfg", configfile) | 116 | "%s for extlinux.conf", configfile) |
114 | else: | 117 | else: |
115 | raise WicError("configfile is specified but failed to " | 118 | raise WicError("configfile is specified but failed to " |
116 | "get it from %s." % configfile) | 119 | "get it from %s." % configfile) |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index f2639e7004..a207a83530 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -122,7 +122,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
122 | syslinux_conf += "DEFAULT boot\n" | 122 | syslinux_conf += "DEFAULT boot\n" |
123 | syslinux_conf += "LABEL boot\n" | 123 | syslinux_conf += "LABEL boot\n" |
124 | 124 | ||
125 | kernel = "/vmlinuz" | 125 | kernel = "/" + get_bitbake_var("KERNEL_IMAGETYPE") |
126 | syslinux_conf += "KERNEL " + kernel + "\n" | 126 | syslinux_conf += "KERNEL " + kernel + "\n" |
127 | 127 | ||
128 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ | 128 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ |
@@ -155,8 +155,8 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
155 | kernel = "%s-%s.bin" % \ | 155 | kernel = "%s-%s.bin" % \ |
156 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) | 156 | (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) |
157 | 157 | ||
158 | cmds = ("install -m 0644 %s/%s %s/vmlinuz" % | 158 | cmds = ("install -m 0644 %s/%s %s/%s" % |
159 | (staging_kernel_dir, kernel, hdddir), | 159 | (staging_kernel_dir, kernel, hdddir, get_bitbake_var("KERNEL_IMAGETYPE")), |
160 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % | 160 | "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" % |
161 | (bootimg_dir, hdddir), | 161 | (bootimg_dir, hdddir), |
162 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % | 162 | "install -m 0644 %s/syslinux/vesamenu.c32 %s/vesamenu.c32" % |
@@ -186,8 +186,10 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
186 | # dosfs image, created by mkdosfs | 186 | # dosfs image, created by mkdosfs |
187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) | 187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) |
188 | 188 | ||
189 | dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ | 189 | label = part.label if part.label else "boot" |
190 | (part.fsuuid, bootimg, blocks) | 190 | |
191 | dosfs_cmd = "mkdosfs -n %s -i %s -S 512 -C %s %d" % \ | ||
192 | (label, part.fsuuid, bootimg, blocks) | ||
191 | exec_native_cmd(dosfs_cmd, native_sysroot) | 193 | exec_native_cmd(dosfs_cmd, native_sysroot) |
192 | 194 | ||
193 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 195 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |
diff --git a/scripts/lib/wic/plugins/source/empty.py b/scripts/lib/wic/plugins/source/empty.py index 041617d648..4178912377 100644 --- a/scripts/lib/wic/plugins/source/empty.py +++ b/scripts/lib/wic/plugins/source/empty.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
3 | # | 5 | # |
4 | 6 | ||
@@ -7,9 +9,19 @@ | |||
7 | # To use it you must pass "empty" as argument for the "--source" parameter in | 9 | # To use it you must pass "empty" as argument for the "--source" parameter in |
8 | # the wks file. For example: | 10 | # the wks file. For example: |
9 | # part foo --source empty --ondisk sda --size="1024" --align 1024 | 11 | # part foo --source empty --ondisk sda --size="1024" --align 1024 |
12 | # | ||
13 | # The plugin supports writing zeros to the start of the | ||
14 | # partition. This is useful to overwrite old content like | ||
15 | # filesystem signatures which may be re-recognized otherwise. | ||
16 | # This feature can be enabled with | ||
17 | # '--sourceparams="[fill|size=<N>[S|s|K|k|M|G]][,][bs=<N>[S|s|K|k|M|G]]"' | ||
18 | # Conflicting or missing options throw errors. | ||
10 | 19 | ||
11 | import logging | 20 | import logging |
21 | import os | ||
12 | 22 | ||
23 | from wic import WicError | ||
24 | from wic.ksparser import sizetype | ||
13 | from wic.pluginbase import SourcePlugin | 25 | from wic.pluginbase import SourcePlugin |
14 | 26 | ||
15 | logger = logging.getLogger('wic') | 27 | logger = logging.getLogger('wic') |
@@ -17,6 +29,16 @@ logger = logging.getLogger('wic') | |||
17 | class EmptyPartitionPlugin(SourcePlugin): | 29 | class EmptyPartitionPlugin(SourcePlugin): |
18 | """ | 30 | """ |
19 | Populate unformatted empty partition. | 31 | Populate unformatted empty partition. |
32 | |||
33 | The following sourceparams are supported: | ||
34 | - fill | ||
35 | Fill the entire partition with zeros. Requires '--fixed-size' option | ||
36 | to be set. | ||
37 | - size=<N>[S|s|K|k|M|G] | ||
38 | Set the first N bytes of the partition to zero. Default unit is 'K'. | ||
39 | - bs=<N>[S|s|K|k|M|G] | ||
40 | Write at most N bytes at a time during source file creation. | ||
41 | Defaults to '1M'. Default unit is 'K'. | ||
20 | """ | 42 | """ |
21 | 43 | ||
22 | name = 'empty' | 44 | name = 'empty' |
@@ -29,4 +51,39 @@ class EmptyPartitionPlugin(SourcePlugin): | |||
29 | Called to do the actual content population for a partition i.e. it | 51 | Called to do the actual content population for a partition i.e. it |
30 | 'prepares' the partition to be incorporated into the image. | 52 | 'prepares' the partition to be incorporated into the image. |
31 | """ | 53 | """ |
32 | return | 54 | get_byte_count = sizetype('K', True) |
55 | size = 0 | ||
56 | |||
57 | if 'fill' in source_params and 'size' in source_params: | ||
58 | raise WicError("Conflicting source parameters 'fill' and 'size' specified, exiting.") | ||
59 | |||
60 | # Set the size of the zeros to be written to the partition | ||
61 | if 'fill' in source_params: | ||
62 | if part.fixed_size == 0: | ||
63 | raise WicError("Source parameter 'fill' only works with the '--fixed-size' option, exiting.") | ||
64 | size = get_byte_count(part.fixed_size) | ||
65 | elif 'size' in source_params: | ||
66 | size = get_byte_count(source_params['size']) | ||
67 | |||
68 | if size == 0: | ||
69 | # Nothing to do, create empty partition | ||
70 | return | ||
71 | |||
72 | if 'bs' in source_params: | ||
73 | bs = get_byte_count(source_params['bs']) | ||
74 | else: | ||
75 | bs = get_byte_count('1M') | ||
76 | |||
77 | # Create a binary file of the requested size filled with zeros | ||
78 | source_file = os.path.join(cr_workdir, 'empty-plugin-zeros%s.bin' % part.lineno) | ||
79 | if not os.path.exists(os.path.dirname(source_file)): | ||
80 | os.makedirs(os.path.dirname(source_file)) | ||
81 | |||
82 | quotient, remainder = divmod(size, bs) | ||
83 | with open(source_file, 'wb') as file: | ||
84 | for _ in range(quotient): | ||
85 | file.write(bytearray(bs)) | ||
86 | file.write(bytearray(remainder)) | ||
87 | |||
88 | part.size = (size + 1024 - 1) // 1024 # size in KB rounded up | ||
89 | part.source_file = source_file | ||
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index afc9ea0f8f..607356ad13 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
3 | # | 5 | # |
4 | # DESCRIPTION | 6 | # DESCRIPTION |
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 3c4997d8ba..21903c2f23 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py | |||
@@ -1,9 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
3 | # | 5 | # |
4 | 6 | ||
5 | import logging | 7 | import logging |
6 | import os | 8 | import os |
9 | import signal | ||
10 | import subprocess | ||
7 | 11 | ||
8 | from wic import WicError | 12 | from wic import WicError |
9 | from wic.pluginbase import SourcePlugin | 13 | from wic.pluginbase import SourcePlugin |
@@ -21,6 +25,10 @@ class RawCopyPlugin(SourcePlugin): | |||
21 | 25 | ||
22 | @staticmethod | 26 | @staticmethod |
23 | def do_image_label(fstype, dst, label): | 27 | def do_image_label(fstype, dst, label): |
28 | # don't create label when fstype is none | ||
29 | if fstype == 'none': | ||
30 | return | ||
31 | |||
24 | if fstype.startswith('ext'): | 32 | if fstype.startswith('ext'): |
25 | cmd = 'tune2fs -L %s %s' % (label, dst) | 33 | cmd = 'tune2fs -L %s %s' % (label, dst) |
26 | elif fstype in ('msdos', 'vfat'): | 34 | elif fstype in ('msdos', 'vfat'): |
@@ -29,15 +37,35 @@ class RawCopyPlugin(SourcePlugin): | |||
29 | cmd = 'btrfs filesystem label %s %s' % (dst, label) | 37 | cmd = 'btrfs filesystem label %s %s' % (dst, label) |
30 | elif fstype == 'swap': | 38 | elif fstype == 'swap': |
31 | cmd = 'mkswap -L %s %s' % (label, dst) | 39 | cmd = 'mkswap -L %s %s' % (label, dst) |
32 | elif fstype == 'squashfs': | 40 | elif fstype in ('squashfs', 'erofs'): |
33 | raise WicError("It's not possible to update a squashfs " | 41 | raise WicError("It's not possible to update a %s " |
34 | "filesystem label '%s'" % (label)) | 42 | "filesystem label '%s'" % (fstype, label)) |
35 | else: | 43 | else: |
36 | raise WicError("Cannot update filesystem label: " | 44 | raise WicError("Cannot update filesystem label: " |
37 | "Unknown fstype: '%s'" % (fstype)) | 45 | "Unknown fstype: '%s'" % (fstype)) |
38 | 46 | ||
39 | exec_cmd(cmd) | 47 | exec_cmd(cmd) |
40 | 48 | ||
49 | @staticmethod | ||
50 | def do_image_uncompression(src, dst, workdir): | ||
51 | def subprocess_setup(): | ||
52 | # Python installs a SIGPIPE handler by default. This is usually not what | ||
53 | # non-Python subprocesses expect. | ||
54 | # SIGPIPE errors are known issues with gzip/bash | ||
55 | signal.signal(signal.SIGPIPE, signal.SIG_DFL) | ||
56 | |||
57 | extension = os.path.splitext(src)[1] | ||
58 | decompressor = { | ||
59 | ".bz2": "bzip2", | ||
60 | ".gz": "gzip", | ||
61 | ".xz": "xz", | ||
62 | ".zst": "zstd -f", | ||
63 | }.get(extension) | ||
64 | if not decompressor: | ||
65 | raise WicError("Not supported compressor filename extension: %s" % extension) | ||
66 | cmd = "%s -dc %s > %s" % (decompressor, src, dst) | ||
67 | subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True, cwd=workdir) | ||
68 | |||
41 | @classmethod | 69 | @classmethod |
42 | def do_prepare_partition(cls, part, source_params, cr, cr_workdir, | 70 | def do_prepare_partition(cls, part, source_params, cr, cr_workdir, |
43 | oe_builddir, bootimg_dir, kernel_dir, | 71 | oe_builddir, bootimg_dir, kernel_dir, |
@@ -56,7 +84,13 @@ class RawCopyPlugin(SourcePlugin): | |||
56 | if 'file' not in source_params: | 84 | if 'file' not in source_params: |
57 | raise WicError("No file specified") | 85 | raise WicError("No file specified") |
58 | 86 | ||
59 | src = os.path.join(kernel_dir, source_params['file']) | 87 | if 'unpack' in source_params: |
88 | img = os.path.join(kernel_dir, source_params['file']) | ||
89 | src = os.path.join(cr_workdir, os.path.splitext(source_params['file'])[0]) | ||
90 | RawCopyPlugin.do_image_uncompression(img, src, cr_workdir) | ||
91 | else: | ||
92 | src = os.path.join(kernel_dir, source_params['file']) | ||
93 | |||
60 | dst = os.path.join(cr_workdir, "%s.%s" % (os.path.basename(source_params['file']), part.lineno)) | 94 | dst = os.path.join(cr_workdir, "%s.%s" % (os.path.basename(source_params['file']), part.lineno)) |
61 | 95 | ||
62 | if not os.path.exists(os.path.dirname(dst)): | 96 | if not os.path.exists(os.path.dirname(dst)): |
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 96d940a91d..c990143c0d 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py | |||
@@ -35,7 +35,7 @@ class RootfsPlugin(SourcePlugin): | |||
35 | @staticmethod | 35 | @staticmethod |
36 | def __validate_path(cmd, rootfs_dir, path): | 36 | def __validate_path(cmd, rootfs_dir, path): |
37 | if os.path.isabs(path): | 37 | if os.path.isabs(path): |
38 | logger.error("%s: Must be relative: %s" % (cmd, orig_path)) | 38 | logger.error("%s: Must be relative: %s" % (cmd, path)) |
39 | sys.exit(1) | 39 | sys.exit(1) |
40 | 40 | ||
41 | # Disallow climbing outside of parent directory using '..', | 41 | # Disallow climbing outside of parent directory using '..', |
@@ -43,14 +43,14 @@ class RootfsPlugin(SourcePlugin): | |||
43 | # directory, or modify a directory outside OpenEmbedded). | 43 | # directory, or modify a directory outside OpenEmbedded). |
44 | full_path = os.path.realpath(os.path.join(rootfs_dir, path)) | 44 | full_path = os.path.realpath(os.path.join(rootfs_dir, path)) |
45 | if not full_path.startswith(os.path.realpath(rootfs_dir)): | 45 | if not full_path.startswith(os.path.realpath(rootfs_dir)): |
46 | logger.error("%s: Must point inside the rootfs:" % (cmd, path)) | 46 | logger.error("%s: Must point inside the rootfs: %s" % (cmd, path)) |
47 | sys.exit(1) | 47 | sys.exit(1) |
48 | 48 | ||
49 | return full_path | 49 | return full_path |
50 | 50 | ||
51 | @staticmethod | 51 | @staticmethod |
52 | def __get_rootfs_dir(rootfs_dir): | 52 | def __get_rootfs_dir(rootfs_dir): |
53 | if os.path.isdir(rootfs_dir): | 53 | if rootfs_dir and os.path.isdir(rootfs_dir): |
54 | return os.path.realpath(rootfs_dir) | 54 | return os.path.realpath(rootfs_dir) |
55 | 55 | ||
56 | image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) | 56 | image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) |
@@ -97,6 +97,9 @@ class RootfsPlugin(SourcePlugin): | |||
97 | part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) | 97 | part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) |
98 | pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") | 98 | pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") |
99 | if not os.path.lexists(pseudo_dir): | 99 | if not os.path.lexists(pseudo_dir): |
100 | pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo') | ||
101 | |||
102 | if not os.path.lexists(pseudo_dir): | ||
100 | logger.warn("%s folder does not exist. " | 103 | logger.warn("%s folder does not exist. " |
101 | "Usernames and permissions will be invalid " % pseudo_dir) | 104 | "Usernames and permissions will be invalid " % pseudo_dir) |
102 | pseudo_dir = None | 105 | pseudo_dir = None |
@@ -218,10 +221,10 @@ class RootfsPlugin(SourcePlugin): | |||
218 | # Update part.has_fstab here as fstab may have been added or | 221 | # Update part.has_fstab here as fstab may have been added or |
219 | # removed by the above modifications. | 222 | # removed by the above modifications. |
220 | part.has_fstab = os.path.exists(os.path.join(new_rootfs, "etc/fstab")) | 223 | part.has_fstab = os.path.exists(os.path.join(new_rootfs, "etc/fstab")) |
221 | if part.update_fstab_in_rootfs and part.has_fstab: | 224 | if part.update_fstab_in_rootfs and part.has_fstab and not part.no_fstab_update: |
222 | fstab_path = os.path.join(new_rootfs, "etc/fstab") | 225 | fstab_path = os.path.join(new_rootfs, "etc/fstab") |
223 | # Assume that fstab should always be owned by root with fixed permissions | 226 | # Assume that fstab should always be owned by root with fixed permissions |
224 | install_cmd = "install -m 0644 %s %s" % (part.updated_fstab_path, fstab_path) | 227 | install_cmd = "install -m 0644 -p %s %s" % (part.updated_fstab_path, fstab_path) |
225 | if new_pseudo: | 228 | if new_pseudo: |
226 | pseudo = cls.__get_pseudo(native_sysroot, new_rootfs, new_pseudo) | 229 | pseudo = cls.__get_pseudo(native_sysroot, new_rootfs, new_pseudo) |
227 | else: | 230 | else: |