mirror of
git://git.yoctoproject.org/meta-rockchip.git
synced 2025-07-05 05:04:47 +02:00
9f37e0902c
The commit ed3a97f7b2 ("rockchip-wic.inc: don't let wic edit fstab")
removing this ability was introduced to fix an issue in the wic tool in
OE-Core in which wic partitions whose "mountpoint" is not a valid path
are still added to fstab.
This was eventually fixed in OE-Core in commit 7aa678ce804c
("wic:direct.py: ignore invalid mountpoints during fstab update") which
is part of release Honister (3.4) and later.
Therefore, it should be safe to now let wic update fstab again for
partitions with a valid mountpoint path. The benefit being that the wic
partitions with a mountpoint are now automounted at boot.
Cc: Quentin Schulz <foss+yocto@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
30 lines
741 B
C++
30 lines
741 B
C++
# common meta-rockchip wic/wks items
|
|
|
|
SPL_BINARY ?= "idbloader.img"
|
|
|
|
IMAGE_FSTYPES += "wic wic.bmap"
|
|
WKS_FILE = "rockchip.wks"
|
|
WKS_FILE_DEPENDS ?= " \
|
|
mtools-native \
|
|
dosfstools-native \
|
|
e2fsprogs-native \
|
|
virtual/bootloader \
|
|
virtual/kernel \
|
|
"
|
|
IMAGE_BOOT_FILES = " \
|
|
${KERNEL_IMAGETYPE} \
|
|
${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${KERNEL_DEVICETREE}', d)} \
|
|
"
|
|
|
|
# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
|
|
# for the console parameter in the wks files
|
|
RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}"
|
|
RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}"
|
|
|
|
WICVARS:append = " \
|
|
RK_CONSOLE_BAUD \
|
|
RK_CONSOLE_DEVICE \
|
|
SPL_BINARY \
|
|
UBOOT_SUFFIX \
|
|
"
|