mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 23:39:40 +01:00
bootimg-partition: break out code to a common library.
Break out the code that parse IMAGE_BOOT_FILES to a common library. (From OE-Core rev: 1e07fe51bdb24070308c85e83df0b80ab9f83cea) Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> Reviewed-by: Konrad Weihmann <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
28fd497a26
commit
d045fed31a
@@ -16,7 +16,7 @@ import logging
|
||||
import os
|
||||
import re
|
||||
|
||||
from glob import glob
|
||||
from oe.bootfiles import get_boot_files
|
||||
|
||||
from wic import WicError
|
||||
from wic.engine import get_custom_config
|
||||
@@ -66,42 +66,7 @@ class BootimgPartitionPlugin(SourcePlugin):
|
||||
|
||||
logger.debug('Boot files: %s', boot_files)
|
||||
|
||||
# list of tuples (src_name, dst_name)
|
||||
deploy_files = []
|
||||
for src_entry in re.findall(r'[\w;\-\./\*]+', boot_files):
|
||||
if ';' in src_entry:
|
||||
dst_entry = tuple(src_entry.split(';'))
|
||||
if not dst_entry[0] or not dst_entry[1]:
|
||||
raise WicError('Malformed boot file entry: %s' % src_entry)
|
||||
else:
|
||||
dst_entry = (src_entry, src_entry)
|
||||
|
||||
logger.debug('Destination entry: %r', dst_entry)
|
||||
deploy_files.append(dst_entry)
|
||||
|
||||
cls.install_task = [];
|
||||
for deploy_entry in deploy_files:
|
||||
src, dst = deploy_entry
|
||||
if '*' in src:
|
||||
# by default install files under their basename
|
||||
entry_name_fn = os.path.basename
|
||||
if dst != src:
|
||||
# unless a target name was given, then treat name
|
||||
# as a directory and append a basename
|
||||
entry_name_fn = lambda name: \
|
||||
os.path.join(dst,
|
||||
os.path.basename(name))
|
||||
|
||||
srcs = glob(os.path.join(kernel_dir, src))
|
||||
|
||||
logger.debug('Globbed sources: %s', ', '.join(srcs))
|
||||
for entry in srcs:
|
||||
src = os.path.relpath(entry, kernel_dir)
|
||||
entry_dst_name = entry_name_fn(entry)
|
||||
cls.install_task.append((src, entry_dst_name))
|
||||
else:
|
||||
cls.install_task.append((src, dst))
|
||||
|
||||
cls.install_task = get_boot_files(kernel_dir, boot_files)
|
||||
if source_params.get('loader') != "u-boot":
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user