summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-08-21 14:46:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-22 15:46:55 +0100
commit5fa3c3d2e3aa29f4011670d6032e4f7debc88f73 (patch)
treecf22e082011738865dce0e0e4343aff2a5890afe /meta/lib
parent5359b85610f8a3e0a42d4817bb7df71436ab1192 (diff)
downloadpoky-5fa3c3d2e3aa29f4011670d6032e4f7debc88f73.tar.gz
wic: Add 512 Byte alignment to --offset
Allows the --offset argument to use the "s" or "S" suffix to specify that it is reporting the number of 512 byte sectors. This is required for some SoCs where the mask ROM looks for an item at a sector that isn't aligned to a 1KB boundary. (From OE-Core rev: 938595d1dc4abaf5f7f3a7900add3f0492b805d0) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 8b58285c32..e6b23c6888 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -890,6 +890,30 @@ class Wic2(WicTestCase):
890 ]) 890 ])
891 891
892 with NamedTemporaryFile("w", suffix=".wks") as tempf: 892 with NamedTemporaryFile("w", suffix=".wks") as tempf:
893 # Test that partitions can be placed on a 512 byte sector boundary
894 tempf.write("bootloader --ptable gpt\n" \
895 "part / --source rootfs --ondisk hda --offset 65s --fixed-size 99M --fstype=ext4\n" \
896 "part /bar --ondisk hda --offset 102432 --fixed-size 100M --fstype=ext4\n")
897 tempf.flush()
898
899 _, partlns = self._get_wic_partitions(tempf.name, native_sysroot)
900 self.assertEqual(partlns, [
901 "1:32.5kiB:101408kiB:101376kiB:ext4:primary:;",
902 "2:102432kiB:204832kiB:102400kiB:ext4:primary:;",
903 ])
904
905 with NamedTemporaryFile("w", suffix=".wks") as tempf:
906 # Test that a partition can be placed immediately after a MSDOS partition table
907 tempf.write("bootloader --ptable msdos\n" \
908 "part / --source rootfs --ondisk hda --offset 1s --fixed-size 100M --fstype=ext4\n")
909 tempf.flush()
910
911 _, partlns = self._get_wic_partitions(tempf.name, native_sysroot)
912 self.assertEqual(partlns, [
913 "1:0.50kiB:102400kiB:102400kiB:ext4::;",
914 ])
915
916 with NamedTemporaryFile("w", suffix=".wks") as tempf:
893 # Test that image creation fails if the partitions would overlap 917 # Test that image creation fails if the partitions would overlap
894 tempf.write("bootloader --ptable gpt\n" \ 918 tempf.write("bootloader --ptable gpt\n" \
895 "part / --source rootfs --ondisk hda --offset 32 --fixed-size 100M --fstype=ext4\n" \ 919 "part / --source rootfs --ondisk hda --offset 32 --fixed-size 100M --fstype=ext4\n" \