mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:18:22 +00:00
Code Issues Projects Releases Wiki Activity

wic: account for mmcblk device partition naming

Browse Source 
MMC block device partitions are named differently than other block
devices and use the scheme: mmcblk<devnum>p<partnum>, ex: mmcblk0p1,
mmcblk0p2. The current code generates incorrect parition names missing
'p' infix for fstab entries. The patch resolves this problem.

(From OE-Core rev: e2664f563921467fe38bb74f4dd2a41eb004ee9f)

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maciej Borzecki
2014-12-22 15:28:02 +01:00
committed by Richard Purdie
parent 51374d55ef
commit 052c67c845
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/lib/wic/imager/direct.py
View File

@@ -100,10 +100,18 @@ class DirectImageCreator(BaseImageCreator):
for num, p in enumerate(parts, 1):
if not p.mountpoint or p.mountpoint == "/" or p.mountpoint == "/boot":
continue
if self._ptable_format == 'msdos' and num > 3:
device_name = "/dev/" + p.disk + str(num + 1)
else:
device_name = "/dev/" + p.disk + str(num)
part = ''
# mmc device partitions are named mmcblk0p1, mmcblk0p2..
if p.disk.startswith('mmcblk'):
part = 'p'
pnum = num
if self._ptable_format == 'msdos' and pnum > 3:
# account for logical partition numbering, ex. sda5..
pnum += 1
device_name = "/dev/" + p.disk + part + str(pnum)
opts = "defaults"
if p.fsopts: